aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
diff options
context:
space:
mode:
authorMonk Liu <Monk.Liu@amd.com>2017-04-26 02:51:54 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-05-24 17:40:39 -0400
commit0c63e11340c6e41795feaaa3768cd6db3b2f8585 (patch)
treeef0bb6c9b95f19e7595305d32e11a4911554d8b1 /drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
parent7225f8736c66b7130d3a6294217ed86f26b59489 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c
index 69da52d7e6e2..bde3ca3c21c1 100644
--- 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,
266{ 266{
267 int r; 267 int r;
268 268
269 /* see what event we get */ 269 /* trigger gpu-reset by hypervisor only if TDR disbaled */
270 r = xgpu_ai_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION); 270 if (amdgpu_lockup_timeout == 0) {
271 271 /* see what event we get */
272 /* only handle FLR_NOTIFY now */ 272 r = xgpu_ai_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION);
273 if (!r) 273
274 schedule_work(&adev->virt.flr_work); 274 /* only handle FLR_NOTIFY now */
275 if (!r)
276 schedule_work(&adev->virt.flr_work);
277 }
275 278
276 return 0; 279 return 0;
277} 280}