Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: don't do soft recovery if gpu_recovery=0

It's impossible to debug shader hangs with soft recovery.

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Marek Olšák and committed by
Alex Deucher
cc063ea2 99010fac

+2 -1
+2 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
··· 37 37 38 38 memset(&ti, 0, sizeof(struct amdgpu_task_info)); 39 39 40 - if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { 40 + if (amdgpu_gpu_recovery && 41 + amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) { 41 42 DRM_ERROR("ring %s timeout, but soft recovered\n", 42 43 s_job->sched->name); 43 44 return;