[PATCH] drm/amdgpu: Fix ras mode2 reset failure in ras aca mode

YiPeng Chai YiPeng.Chai at amd.com
Tue Apr 23 03:13:38 UTC 2024


Fix ras mode2 reset failure in ras aca mode for
sdma v4_4_2 and gfx v9_4_3.

Signed-off-by: YiPeng Chai <YiPeng.Chai at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c  | 4 ++++
 drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index 0e429b7ed036..c8bc34aafdd7 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -4324,6 +4324,10 @@ static int gfx_v9_4_3_ras_late_init(struct amdgpu_device *adev, struct ras_commo
 	if (r)
 		return r;
 
+	/* in resume phase, no need to create aca fs node */
+	if (adev->in_suspend || amdgpu_in_reset(adev))
+		return 0;
+
 	r = amdgpu_ras_bind_aca(adev, AMDGPU_RAS_BLOCK__GFX,
 				&gfx_v9_4_3_aca_info,
 				NULL);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index 7ea209b68154..77ae943745fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -2249,6 +2249,10 @@ static int sdma_v4_4_2_ras_late_init(struct amdgpu_device *adev, struct ras_comm
 	if (r)
 		return r;
 
+	/* in resume phase, no need to create aca fs node */
+	if (adev->in_suspend || amdgpu_in_reset(adev))
+		return 0;
+
 	return amdgpu_ras_bind_aca(adev, AMDGPU_RAS_BLOCK__SDMA,
 				   &sdma_v4_4_2_aca_info, NULL);
 }
-- 
2.34.1



More information about the amd-gfx mailing list