Commit f4892c32 authored Jul 06, 2020 by Marek Olšák Committed by Alex Deucher Jul 09, 2020

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>
Cc: stable@vger.kernel.org

parent 41855a89

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message