Skip to content

Commit

Permalink
drm/amdgpu: don't do soft recovery if gpu_recovery=0
Browse files Browse the repository at this point in the history
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>
Cc: stable@vger.kernel.org
  • Loading branch information
Marek Olšák authored and Alex Deucher committed Jul 9, 2020
1 parent 41855a8 commit f4892c3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ static void amdgpu_job_timedout(struct drm_sched_job *s_job)

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

if (amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {
if (amdgpu_gpu_recovery &&
amdgpu_ring_soft_recovery(ring, job->vmid, s_job->s_fence->parent)) {
DRM_ERROR("ring %s timeout, but soft recovered\n",
s_job->sched->name);
return;
Expand Down

0 comments on commit f4892c3

Please sign in to comment.