From 318f6835491a10317ce976aad3b5ba55de6a0965 Mon Sep 17 00:00:00 2001
From: Candice Li <candice.li@amd.com>
Date: Thu, 2 Jun 2022 01:06:14 +0800
Subject: [PATCH] drm/amdgpu: Resolve RAS GFX error count issue v2
Fix misleading indentation and add ras unsupported checking
for gfx ras late init.
Fixes: fd3fb1b96e29c2 ("drm/amdgpu: Resolve RAS GFX error count issue after cold boot on Arcturus")
Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index 99c1a2d3dae84..16699158e00d8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -599,13 +599,15 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
if (!amdgpu_persistent_edc_harvesting_supported(adev))
amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
- r = amdgpu_ras_block_late_init(adev, ras_block);
- if (r)
- return r;
+ r = amdgpu_ras_block_late_init(adev, ras_block);
+ if (r)
+ return r;
r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);
if (r)
goto late_fini;
+ } else {
+ amdgpu_ras_feature_enable_on_boot(adev, ras_block, 0);
}
return 0;
--
GitLab