diff options
author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2017-12-13 14:36:53 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-15 17:15:00 -0500 |
commit | 8854695add1eaaeafae728850c905c4727e56f35 (patch) | |
tree | bfb113240282734d3401b1ed2cb4c34e2e10c085 /drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | |
parent | dcebf026e6f69fb79e7f88d10681faf4f8a985ba (diff) |
drm/amdgpu: Simplify amdgpu_lockup_timeout usage.
With introduction of amdgpu_gpu_recovery we don't need any more
to rely on amdgpu_lockup_timeout == 0 for disabling GPU reset.
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c index 7ade56d59c27..43e74ec93147 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | |||
@@ -277,7 +277,7 @@ static int xgpu_ai_mailbox_rcv_irq(struct amdgpu_device *adev, | |||
277 | int r; | 277 | int r; |
278 | 278 | ||
279 | /* trigger gpu-reset by hypervisor only if TDR disbaled */ | 279 | /* trigger gpu-reset by hypervisor only if TDR disbaled */ |
280 | if (amdgpu_lockup_timeout == 0) { | 280 | if (!amdgpu_gpu_recovery) { |
281 | /* see what event we get */ | 281 | /* see what event we get */ |
282 | r = xgpu_ai_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION); | 282 | r = xgpu_ai_mailbox_rcv_msg(adev, IDH_FLR_NOTIFICATION); |
283 | 283 | ||