diff options
| author | Hawking Zhang <[email protected]> | 2020-01-16 04:39:15 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2020-01-16 18:40:47 +0000 |
| commit | 93af20f74e8eb4077fecdcc6e8093f13f0059bc9 (patch) | |
| tree | 099650289879f8779812b95be57de91d7d79b8e3 /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | |
| parent | drm/amd/powerplay: a quick fix for the deadlock issue below (diff) | |
| download | kernel-93af20f74e8eb4077fecdcc6e8093f13f0059bc9.tar.gz kernel-93af20f74e8eb4077fecdcc6e8093f13f0059bc9.zip | |
drm/amdgpu: check if driver should try recovery in ras recovery path
To allow the flexibilty for user to disable gpu recovery
in RAS recovery path by module parameter amdgpu_gpu_recovery
Signed-off-by: Hawking Zhang <[email protected]>
Reviewed-by: Guchun Chen <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 991c4eaac244..766be7f18282 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1353,7 +1353,8 @@ static void amdgpu_ras_do_recovery(struct work_struct *work) struct amdgpu_ras *ras = container_of(work, struct amdgpu_ras, recovery_work); - amdgpu_device_gpu_recover(ras->adev, 0); + if (amdgpu_device_should_recover_gpu(ras->adev)) + amdgpu_device_gpu_recover(ras->adev, 0); atomic_set(&ras->in_recovery, 0); } |