[PATCH Review 1/1] drm/amdgpu: Adjust XGMI WAFL ras enable bit

Stanley.Yang Stanley.Yang at amd.com
Thu Apr 25 07:07:50 UTC 2024


The way to get ras capability has changed for some asics,
both of them need check XGMI physical nodes number to
set XGMI WAFL ras enable bit.

Signed-off-by: Stanley.Yang <Stanley.Yang at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index b2a883d3e19d..ea77e00cc002 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2918,13 +2918,6 @@ static void amdgpu_ras_query_ras_capablity_from_vbios(struct amdgpu_device *adev
 		else
 			adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__VCN |
 						  1 << AMDGPU_RAS_BLOCK__JPEG);
-
-		/*
-		 * XGMI RAS is not supported if xgmi num physical nodes
-		 * is zero
-		 */
-		if (!adev->gmc.xgmi.num_physical_nodes)
-			adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__XGMI_WAFL);
 	} else {
 		dev_info(adev->dev, "SRAM ECC is not presented.\n");
 	}
@@ -3002,6 +2995,13 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev)
 	amdgpu_ras_query_poison_mode(adev);
 
 init_ras_enabled_flag:
+	/*
+	 * XGMI RAS is not supported if xgmi num physical nodes
+	 * is zero
+	 */
+	if (!adev->gmc.xgmi.num_physical_nodes)
+		adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__XGMI_WAFL);
+
 	/* hw_supported needs to be aligned with RAS block mask. */
 	adev->ras_hw_enabled &= AMDGPU_RAS_BLOCK_MASK;
 
-- 
2.25.1



More information about the amd-gfx mailing list