drm/amdgpu: remove GPRs init for ALDEBARAN in gpu reset (v3)

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.
v3: Suspend needs it, only skip it in gpu reset.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 24852a2..c4f37a1 100644 (file)
--- 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 (amdgpu_in_reset(adev))
                return 0;
 
        gfx_v9_4_2_do_sgprs_init(adev);