<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="en-CN" link="#467886" vlink="#96607D" style="word-wrap:break-word"> [AMD Official Use Only - General] <div> <div class="WordSection1"> <div> Hi <a id="OWAAMF8548CD07BB205478DF776E1014D2B98" href="mailto:Alexander.Deucher@amd.com">@Deucher, Alexander</a> and <a id="OWAAM645E9576D2BF254CB415F66326EABD7B" href="mailto:Christian.Koenig@amd.com"> @Koenig, Christian</a> Could you help review this patch? Customer needs this toggle to turn off software recovery and use mode2 reset directly. This toggle is also needed when we test mode2 reset using quark tool.<o:p></o:p> <o:p> </o:p> Thanks<o:p></o:p> Sam <div id="mail-editor-reference-message-container"> <div> <div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm"> From: Feng, Kenneth <Kenneth.Feng@amd.com> Date: Monday, April 29, 2024 at 16:14 To: Feng, Kenneth <Kenneth.Feng@amd.com>, amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>, Zhang, GuoQing (Sam) <GuoQing.Zhang@amd.com> Cc: Zhang, Owen(SRDC) <Owen.Zhang2@amd.com>, Aldabagh, Maad <Maad.Aldabagh@amd.com>, Ma, Qing (Mark) <Qing.Ma@amd.com> Subject: RE: [PATCH 1/2] drm/amd/amdgpu: customized the reset to skip soft recovery </div> <div> <a name="BM_BEGIN"></a>[AMD Official Use Only - General] +@Zhang, GuoQing (Sam) -----Original Message----- From: Kenneth Feng <kenneth.feng@amd.com> Sent: Monday, April 29, 2024 3:32 PM To: amd-gfx@lists.freedesktop.org Cc: Zhang, Owen(SRDC) <Owen.Zhang2@amd.com>; Aldabagh, Maad <Maad.Aldabagh@amd.com>; Ma, Qing (Mark) <Qing.Ma@amd.com>; Feng, Kenneth <Kenneth.Feng@amd.com> Subject: [PATCH 1/2] drm/amd/amdgpu: customized the reset to skip soft recovery customized the reset to skip soft recovery Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index ea14f1c8f430..65c3a387fec7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -548,7 +548,7 @@ module_param_named(compute_multipipe, amdgpu_compute_multipipe, int, 0444); * DOC: gpu_recovery (int) * Set to enable GPU recovery mechanism (1 = enable, 0 = disable). The default is -1 (auto, disabled except SRIOV). */ -MODULE_PARM_DESC(gpu_recovery, "Enable GPU recovery mechanism, (1 = enable, 0 = disable, -1 = auto)"); +MODULE_PARM_DESC(gpu_recovery, "Enable GPU recovery mechanism, (1 = +enable, 0 = disable, -1 = auto, 2 = customized)"); module_param_named(gpu_recovery, amdgpu_gpu_recovery, int, 0444); /** diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index e4742b65032d..5c75993698a5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -51,7 +51,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) adev->job_hang = true; - if (amdgpu_gpu_recovery && + if (amdgpu_gpu_recovery && amdgpu_gpu_recovery != 2 && 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); -- 2.34.1 </div> </div> </div> </div> </div> </div> </body> </html>