diff options
author | Christian König <christian.koenig@amd.com> | 2018-08-21 04:45:29 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-08-27 12:11:16 -0400 |
commit | 12938fad234a3924cc9b82080db4f62fe1cf52bb (patch) | |
tree | 3b784794d8d219b95dd22cd5544a05177ea9ec10 /drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | |
parent | 1849e73748be3c80bf752e4c4877fe90a8da4822 (diff) |
drm/amdgpu: cleanup GPU recovery check a bit (v2)
Check if we should call the function instead of providing the forced
flag.
v2: rebase on KFD changes (Alex)
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c index 9fc1c37344ce..842567b53df5 100644 --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | |||
@@ -521,7 +521,8 @@ static void xgpu_vi_mailbox_flr_work(struct work_struct *work) | |||
521 | } | 521 | } |
522 | 522 | ||
523 | /* Trigger recovery due to world switch failure */ | 523 | /* Trigger recovery due to world switch failure */ |
524 | amdgpu_device_gpu_recover(adev, NULL, false); | 524 | if (amdgpu_device_should_recover_gpu(adev)) |
525 | amdgpu_device_gpu_recover(adev, NULL); | ||
525 | } | 526 | } |
526 | 527 | ||
527 | static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev, | 528 | static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev, |