From: Tao Zhou Date: Wed, 17 Jan 2024 08:35:59 +0000 (+0800) Subject: drm/amdgpu: update error condition check for umc_v12_0_query_error_address X-Git-Tag: v6.9-rc1~126^2~22^2~158 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9e4f61df1cce8ffb3b86b99c12a33c2eeb57c39;p=thirdparty%2Flinux.git drm/amdgpu: update error condition check for umc_v12_0_query_error_address Deferred error is also taken into account. Signed-off-by: Tao Zhou Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c index 6423dca5b777f..f63ca575ad63f 100644 --- a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c +++ b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c @@ -305,10 +305,7 @@ static int umc_v12_0_query_error_address(struct amdgpu_device *adev, } /* calculate error address if ue error is detected */ - if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1 && - REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, AddrV) == 1 && - REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, UC) == 1) { - + if (umc_v12_0_is_uncorrectable_error(adev, mc_umc_status)) { mc_umc_addrt0 = SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_ADDRT0);