Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ede24894 authored by Marek Olšák's avatar Marek Olšák Committed by Greg Kroah-Hartman
Browse files

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



commit f4892c327a8e5df7ce16cab40897daf90baf6bec upstream.

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

Signed-off-by: default avatarMarek Olšák <marek.olsak@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef8164f0

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

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,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;