drm/amdgpu: use GMC v9 KIQ workaround only for the GFXHUB
authorChristian König <christian.koenig@amd.com>
Thu, 25 Oct 2018 09:02:50 +0000 (11:02 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 5 Nov 2018 20:49:41 +0000 (15:49 -0500)
The MMHUB is not affected by this.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Emily Deng <Emily.Deng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

index 14ca4d835e0bb27ab1de3142c6a7bbf455ad533f..811231e4ec53a68bb322a99b86859e8417cdc9ca 100644 (file)
@@ -338,9 +338,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev,
                struct amdgpu_vmhub *hub = &adev->vmhub[i];
                u32 tmp = gmc_v9_0_get_invalidate_req(vmid, flush_type);
 
-               if (adev->gfx.kiq.ring.sched.ready &&
-                   (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev)) &&
-                   !adev->in_gpu_reset) {
+               if (i == AMDGPU_GFXHUB && !adev->in_gpu_reset &&
+                   adev->gfx.kiq.ring.sched.ready &&
+                   (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev))) {
                        uint32_t req = hub->vm_inv_eng0_req + eng;
                        uint32_t ack = hub->vm_inv_eng0_ack + eng;