From: Hawking Zhang Date: Wed, 20 Nov 2019 11:21:35 +0000 (+0800) Subject: drm/amdgpu: apply gpr/gds workaround before enabling GFX EDC mode X-Git-Tag: v5.10.7~3266^2~25^2~137 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be3e73ea7def13abbb481844aaaa073903e18b03;p=platform%2Fkernel%2Flinux-rpi.git 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 Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- 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 --- 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; }