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

* [PATCH] drm/amdgpu: don't do soft recovery if gpu_recovery=0
@ 2020-07-06 22:28 Marek Olšák
  2020-07-07 14:14 ` Alex Deucher
  0 siblings, 1 reply; 3+ messages in thread
From: Marek Olšák @ 2020-07-06 22:28 UTC (permalink / raw)
  To: amd-gfx mailing list


[-- Attachment #1.1: Type: text/plain, Size: 30 bytes --]

Please review. Thanks.

Marek

[-- Attachment #1.2: Type: text/html, Size: 90 bytes --]

[-- Attachment #2: 0001-drm-amdgpu-don-t-do-soft-recovery-if-gpu_recovery-0.patch --]
[-- Type: text/x-patch, Size: 1191 bytes --]

From 794a2599e81d7d21e5c8ca475818309f59ad7e48 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: [PATCH] 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

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

Signed-off-by: Marek Olšák <marek.olsak@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 2975c4a6e581..937029ad5271 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -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;
-- 
2.17.1


[-- Attachment #3: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread