drm/amdgpu: apply gpr/gds workaround before enabling GFX EDC mode

gfx memory should be initialized before enabling
DED and FUE field in mmGB_EDC_MODE

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

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index f6e39b3..cc8dab5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -4235,10 +4235,6 @@ static int gfx_v9_0_ecc_late_init(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        int r;
 
-       r = amdgpu_gfx_ras_late_init(adev);
-       if (r)
-               return r;
-
        r = gfx_v9_0_do_edc_gds_workarounds(adev);
        if (r)
                return r;
@@ -4248,6 +4244,10 @@ static int gfx_v9_0_ecc_late_init(void *handle)
        if (r)
                return r;
 
+       r = amdgpu_gfx_ras_late_init(adev);
+       if (r)
+               return r;
+
        return 0;
 }