| From f4892c327a8e5df7ce16cab40897daf90baf6bec Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com> |
| Date: Mon, 6 Jul 2020 18:23:17 -0400 |
| Subject: drm/amdgpu: don't do soft recovery if gpu_recovery=0 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Marek Olšák <marek.olsak@amd.com> |
| |
| commit f4892c327a8e5df7ce16cab40897daf90baf6bec upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c |
| @@ -36,7 +36,8 @@ static void amdgpu_job_timedout(struct d |
| |
| 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; |