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>

diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
index 69da52d7e6e2ada6b2e922d0c73162228d3710ee..bde3ca3c21c190fb526a3f0fe7a1706122a71f59 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
+++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
@@ -266,12 +266,15 @@ static int xgpu_ai_mailbox_rcv_irq(struct amdgpu_device *adev,
 {
        int r;
 
-       /* see what event we get */
-       r = xgpu_ai_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_ai_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION);
+
+               /* only handle FLR_NOTIFY now */
+               if (!r)
+                       schedule_work(&adev->virt.flr_work);
+       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c
index 1cdf5cc8cc67d24b511a526dd6e4ec000eca49bf..171a658135b50795d3420eb6f50bd195fb79d35c 100644 (file)
--- 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;
 }