drm/amdgpu: fix VMHUB order to match the hardware

Match our defines with what the hw uses.

Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 5c6bcacd11affd03d3f18df5e2e3cd056aff3126..a90b49a15335a908513ebdc486435cb55cdff2e9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -124,8 +124,8 @@ extern int amdgpu_param_buf_per_se;
 
 /* max number of VMHUB */
 #define AMDGPU_MAX_VMHUBS                      2
-#define AMDGPU_MMHUB                           0
-#define AMDGPU_GFXHUB                          1
+#define AMDGPU_GFXHUB                          0
+#define AMDGPU_MMHUB                           1
 
 /* hardcode that limit for now */
 #define AMDGPU_VA_RESERVED_SIZE                        (8 << 20)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index df69aae99df48cb95c0a16a3e26486268f0a307a..8dd99b2a0026b5332dc5c55703dc5ec30400e4cc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -129,8 +129,7 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
                                struct amdgpu_irq_src *source,
                                struct amdgpu_iv_entry *entry)
 {
-       struct amdgpu_vmhub *gfxhub = &adev->vmhub[AMDGPU_GFXHUB];
-       struct amdgpu_vmhub *mmhub = &adev->vmhub[AMDGPU_MMHUB];
+       struct amdgpu_vmhub *hub = &adev->vmhub[entry->vm_id_src];
        uint32_t status = 0;
        u64 addr;
 
@@ -138,13 +137,8 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
        addr |= ((u64)entry->src_data[1] & 0xf) << 44;
 
        if (!amdgpu_sriov_vf(adev)) {
-               if (entry->vm_id_src) {
-                       status = RREG32(mmhub->vm_l2_pro_fault_status);
-                       WREG32_P(mmhub->vm_l2_pro_fault_cntl, 1, ~1);
-               } else {
-                       status = RREG32(gfxhub->vm_l2_pro_fault_status);
-                       WREG32_P(gfxhub->vm_l2_pro_fault_cntl, 1, ~1);
-               }
+               status = RREG32(hub->vm_l2_pro_fault_status);
+               WREG32_P(hub->vm_l2_pro_fault_cntl, 1, ~1);
        }
 
        if (printk_ratelimit()) {