[AMD Official Use Only] S3/S4 needs re-run the shader. So let's just skip mode-1 reset.
Regards, Hawking -----Original Message----- From: Zhou1, Tao <[email protected]> Sent: Tuesday, October 26, 2021 18:33 To: [email protected]; Zhang, Hawking <[email protected]> Cc: Zhou1, Tao <[email protected]> Subject: [PATCH] drm/amdgpu: remove GPRs init for ALDEBARAN in gpu reset (v2) Remove GPRs init for ALDEBARAN in gpu reset temporarily, will add the init once the algorithm is stable. v2: Only remove GPRs init in gpu reset. Signed-off-by: Tao Zhou <[email protected]> --- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c index 24852a24cc58..9d0f4f1026cb 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c @@ -706,9 +706,9 @@ int gfx_v9_4_2_do_edc_gpr_workarounds(struct amdgpu_device *adev) if (!amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) return 0; - /* Workaround for some CU settings, skip GPRs init. - Will remove it once GPRs init algorithm works for all CU settings */ - if (adev->gfx.cu_info.bitmap[1][1] == 0x3f7f) + /* Workaround for ALDEBARAN, skip GPRs init in GPU reset. + Will remove it once GPRs init algorithm works for all CU settings. */ + if (adev->in_suspend || amdgpu_in_reset(adev)) return 0; gfx_v9_4_2_do_sgprs_init(adev); -- 2.17.1
