drm/amdgpu: drop duplicated ecc check for vega10 (v2)
Subsystems (2)
PATCH 1/1 drm/amdgpu: drop duplicated ecc check for vega10 (v2)
The same ECC check has been executed in amdgpu_ras_init for vega10, prior to gmc_v9_0_late_init.
v2: drop all atombios helper callings
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -12
@@ -1193,21 +1193,13 @@ static int gmc_v9_0_late_init(void *handle) r =amdgpu_gmc_allocate_vm_inv_eng (adev);if (r)return r; -/* Check if ecc is available */ + +/* apply DF parity workaround */ if (!amdgpu_sriov_vf (adev) && (adev->asic_type ==CHIP_VEGA10 )) { - r =amdgpu_atomfirmware_mem_ecc_supported (adev); -if (!r) { -DRM_INFO ("ECC is not present.\n" ); +if (adev->ras_features &AMDGPU_RAS_BLOCK__UMC ) {if (adev->df.funcs->enable_ecc_force_par_wr_rmw) adev->df.funcs->enable_ecc_force_par_wr_rmw (adev, false); - }else -DRM_INFO ("ECC is active.\n" ); - - r =amdgpu_atomfirmware_sram_ecc_supported (adev); -if (!r) -DRM_INFO ("SRAM ECC is not present.\n" ); -else -DRM_INFO ("SRAM ECC is active.\n" ); + } }if (adev->mmhub.funcs && adev->mmhub.funcs->reset_ras_error_count)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
+ if (adev->ras_features & AMDGPU_RAS_BLOCK__UMC)
ras_feature is in bitmask, so it should be 1 << block or use BIT macro here for the check
Regards,
Hawking
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Tuesday, September 29, 2020 14:14
To: [email protected]; Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: drop duplicated ecc check for vega10 (v2)
The same ECC check has been executed in amdgpu_ras_init for vega10, prior to gmc_v9_0_late_init.
v2: drop all atombios helper callings
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -12
@@ -1193,21 +1193,13 @@ static int gmc_v9_0_late_init(void *handle) r =amdgpu_gmc_allocate_vm_inv_eng (adev);if (r)return r; -/* Check if ecc is available */ + +/* apply DF parity workaround */ if (!amdgpu_sriov_vf (adev) && (adev->asic_type ==CHIP_VEGA10 )) { - r =amdgpu_atomfirmware_mem_ecc_supported (adev); -if (!r) { -DRM_INFO ("ECC is not present.\n" ); +if (adev->ras_features &AMDGPU_RAS_BLOCK__UMC ) {if (adev->df.funcs->enable_ecc_force_par_wr_rmw) adev->df.funcs->enable_ecc_force_par_wr_rmw (adev, false); - }else -DRM_INFO ("ECC is active.\n" ); - - r =amdgpu_atomfirmware_sram_ecc_supported (adev); -if (!r) -DRM_INFO ("SRAM ECC is not present.\n" ); -else -DRM_INFO ("SRAM ECC is active.\n" ); + } }if (adev->mmhub.funcs && adev->mmhub.funcs->reset_ras_error_count)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
My BAD. Will correct it in v3.
Regards,
Guchun
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Tuesday, September 29, 2020 2:36 PM
To: Chen, Guchun <[email protected]>; [email protected]; Deucher, Alexander <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: drop duplicated ecc check for vega10 (v2)
[AMD Public Use]
+ if (adev->ras_features & AMDGPU_RAS_BLOCK__UMC)
ras_feature is in bitmask, so it should be 1 << block or use BIT macro here for the check
Regards,
Hawking
-----Original Message-----
From: Chen, Guchun <[email protected]>
Sent: Tuesday, September 29, 2020 14:14
To: [email protected]; Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Li, Dennis <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>
Cc: Chen, Guchun <[email protected]>
Subject: [PATCH] drm/amdgpu: drop duplicated ecc check for vega10 (v2)
The same ECC check has been executed in amdgpu_ras_init for vega10, prior to gmc_v9_0_late_init.
v2: drop all atombios helper callings
--- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -12
@@ -1193,21 +1193,13 @@ static int gmc_v9_0_late_init(void *handle) r =amdgpu_gmc_allocate_vm_inv_eng (adev);if (r)return r; -/* Check if ecc is available */ + +/* apply DF parity workaround */ if (!amdgpu_sriov_vf (adev) && (adev->asic_type ==CHIP_VEGA10 )) { - r =amdgpu_atomfirmware_mem_ecc_supported (adev); -if (!r) { -DRM_INFO ("ECC is not present.\n" ); +if (adev->ras_features &AMDGPU_RAS_BLOCK__UMC ) {if (adev->df.funcs->enable_ecc_force_par_wr_rmw) adev->df.funcs->enable_ecc_force_par_wr_rmw (adev, false); - }else -DRM_INFO ("ECC is active.\n" ); - - r =amdgpu_atomfirmware_sram_ecc_supported (adev); -if (!r) -DRM_INFO ("SRAM ECC is not present.\n" ); -else -DRM_INFO ("SRAM ECC is active.\n" ); + } }if (adev->mmhub.funcs && adev->mmhub.funcs->reset_ras_error_count)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx