drm/amdgpu:only call flr_work under infinite timeout

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

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
index 1cdf5cc8cc67..171a658135b5 100644
--- a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
@@ -537,12 +537,15 @@ static int xgpu_vi_mailbox_rcv_irq(struct amdgpu_device *adev,
 {
         int r;
 
-        /* see what event we get */
-        r = xgpu_vi_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION);
-
-        /* only handle FLR_NOTIFY now */
-        if (!r)
-                schedule_work(&adev->virt.flr_work);
+        /* trigger gpu-reset by hypervisor only if TDR disbaled */
+        if (amdgpu_lockup_timeout == 0) {
+                /* see what event we get */
+                r = xgpu_vi_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION);
+
+                /* only handle FLR_NOTIFY now */
+                if (!r)
+                        schedule_work(&adev->virt.flr_work);
+        }
 
         return 0;
 }