drm/amdgpu: Don't use kiq in gpu reset

When in gpu reset, don't use kiq, it will generate more TDR.

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

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index b6b5ede0ca35de07dcce84246cf95396000d1d2b..6763570c0321a2ae5124cc246701fa616acb02f1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -332,15 +332,8 @@ signed long  amdgpu_kiq_reg_write_reg_wait(struct amdgpu_device *adev,
 
        r = amdgpu_fence_wait_polling(ring, seq, MAX_KIQ_REG_WAIT);
 
-       /* don't wait anymore for gpu reset case because this way may
-        * block gpu_recover() routine forever, e.g. this virt_kiq_rreg
-        * is triggered in TTM and ttm_bo_lock_delayed_workqueue() will
-        * never return if we keep waiting in virt_kiq_rreg, which cause
-        * gpu_recover() hang there.
-        *
-        * also don't wait anymore for IRQ context
-        * */
-       if (r < 1 && (adev->in_gpu_reset || in_interrupt()))
+       /* don't wait anymore for IRQ context */
+       if (r < 1 && in_interrupt())
                goto failed_kiq;
 
        might_sleep();
@@ -388,8 +381,8 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev,
                u32 tmp = gmc_v9_0_get_invalidate_req(vmid);
 
                if (adev->gfx.kiq.ring.ready &&
-                   (amdgpu_sriov_runtime(adev) ||
-                    !amdgpu_sriov_vf(adev))) {
+                   (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev)) &&
+                   !adev->in_gpu_reset) {
                        r = amdgpu_kiq_reg_write_reg_wait(adev, hub->vm_inv_eng0_req + eng,
                                hub->vm_inv_eng0_ack + eng, tmp, 1 << vmid);
                        if (!r)