Skip to content

Commit f4892c3

Browse files
Marek Olšákalexdeucher
authored andcommitted
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 <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 41855a8 commit f4892c3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)
3737

3838
memset(&ti, 0, sizeof(struct amdgpu_task_info));
3939

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)) {
4142
DRM_ERROR("ring %s timeout, but soft recovered\n",
4243
s_job->sched->name);
4344
return;

0 commit comments

Comments
 (0)