drm/amdgpu: add deferred error check for UMC v12 address query

Tao Zhou · alexdeucher · commit 2c684b934244 · 2024-02-29T20:35:14.000-05:00
Both RAS UE and deferred errors need page retirement.

Signed-off-by: Tao Zhou &lt;tao.zhou1@amd.com&gt;
Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
@@ -348,7 +348,8 @@ static int umc_v12_0_query_error_address(struct amdgpu_device *adev,
 	}
 
 	/* calculate error address if ue error is detected */
-	if (umc_v12_0_is_uncorrectable_error(adev, mc_umc_status)) {
+	if (umc_v12_0_is_uncorrectable_error(adev, mc_umc_status) ||
+	    umc_v12_0_is_deferred_error(adev, mc_umc_status)) {
 		mc_umc_addrt0 =
 			SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_ADDRT0);
 

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,8 @@ static int umc_v12_0_query_error_address(struct amdgpu_device *adev,`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`/* calculate error address if ue error is detected */`
`351`		`- if (umc_v12_0_is_uncorrectable_error(adev, mc_umc_status)) {`
	`351`	`+ if (umc_v12_0_is_uncorrectable_error(adev, mc_umc_status) \|\|`
	`352`	`+ umc_v12_0_is_deferred_error(adev, mc_umc_status)) {`
`352`	`353`	`mc_umc_addrt0 =`
`353`	`354`	`SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_ADDRT0);`
`354`	`355`