Skip to contentSkip to conversation

drm/amd/amdgpu: skip ras late init if it is not supported

PATCH In review Kenneth Feng 2 participants 2 messages Nov 2, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/amdgpu: skip ras late init if it is not supported

skip ras late init on gc_11_0_3 if it is not supported, in order to prevent the hardware init exception.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +1 -1
index 84a76c36d9a7..afe1fadc1e9d 100644
@@ -4707,7 +4707,7 @@ static int gfx_v11_0_late_init(void *handle)
 	if (r)
 		return r;
 
-	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3)) {
+	if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3) && adev->ras_enabled) {
 		r = gfx_v11_0_ras_late_init(handle);
 		if (r)
 			return r;
Signature · 1 line
2.25.1
maintainer Acked-by on v1 1/1
#1 lore raw

[Public]

________________________________
From: amd-gfx <[email protected]> on behalf of Kenneth Feng <[email protected]>
Sent: Wednesday, November 2, 2022 6:14 AM
To: [email protected] <[email protected]>
Cc: Feng, Kenneth <[email protected]>
Subject: [PATCH] drm/amd/amdgpu: skip ras late init if it is not supported

skip ras late init on gc_11_0_3 if it is not supported, in order to prevent the hardware init exception.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +1 -1
index 84a76c36d9a7..afe1fadc1e9d 100644
@@ -4707,7 +4707,7 @@ static int gfx_v11_0_late_init(void *handle)
         if (r)
                 return r;
 
-       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3)) {
+       if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 3) && adev->ras_enabled) {
                 r = gfx_v11_0_ras_late_init(handle);
                 if (r)
                         return r;

--
2.25.1