diff options
| author | Christian König <[email protected]> | 2018-08-21 08:45:29 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2018-08-27 16:11:16 +0000 |
| commit | 12938fad234a3924cc9b82080db4f62fe1cf52bb (patch) | |
| tree | 3b784794d8d219b95dd22cd5544a05177ea9ec10 /drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | |
| parent | drm/amdgpu: amdgpu_kiq_reg_write_reg_wait() can be static (diff) | |
| download | kernel-12938fad234a3924cc9b82080db4f62fe1cf52bb.tar.gz kernel-12938fad234a3924cc9b82080db4f62fe1cf52bb.zip | |
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 <[email protected]>
Acked-by: Andrey Grodzovsky <[email protected]>
Reviewed-by: Huang Rui <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
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) } /* Trigger recovery due to world switch failure */ - amdgpu_device_gpu_recover(adev, NULL, false); + if (amdgpu_device_should_recover_gpu(adev)) + amdgpu_device_gpu_recover(adev, NULL); } static int xgpu_vi_set_mailbox_rcv_irq(struct amdgpu_device *adev, |