drm/amdgpu: enable 48-bit IH timestamp counter
Subsystems (2)
PATCH 1/1 drm/amdgpu: enable 48-bit IH timestamp counter
By default this timestamp is based on a 32 bit counter. This is used by the amdgpu_gmc_filter_faults, to avoid process the same interrupt in retry configuration. Apparently there's a problem when the timestamp coming from IH overflows and compares against timestamp coming from the the hash table.
This patch only extends the time overflow from 10 minutes to aprx 455 days.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +6 -0
@@ -94,6 +94,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,1 ); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) {DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" );
@@ -109,6 +111,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 ,RB_ENABLE ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , ih_rb_cntl)) {
@@ -125,6 +129,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 ,RB_ENABLE ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , ih_rb_cntl)) {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
maintainerAm 10.11.20 um 04:20 schrieb Alex Sierra:
Quoted 8 lines
By default this timestamp is based on a 32 bit counter. This is used by the
amdgpu_gmc_filter_faults, to avoid process the same interrupt in retry configuration. Apparently there's a problem when the timestamp coming from IH overflows and compares against timestamp coming from the the hash table.
This patch only extends the time overflow from 10 minutes to aprx 455 days.
Good catch, I wasn't aware of that limitation. The documentation from the IH suggested that it is a 64bit value.
Quoted 1 line
Signed-off-by Alex Sierra <[email protected]>
In the long term we probably need some wrap around handling, but for now Reviewed-by: Christian König <[email protected]>
Quoted 27 lines
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/amdgpu/navi10_ih.c +4
-0@@ -94,6 +94,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,RB_ENABLE ,1 ); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL ,ENABLE_INTR ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL , ih_rb_cntl)) {DRM_ERROR ("PSP program IH_RB_CNTL failed!\n" );@@ -109,6 +111,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING1); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 ,RB_ENABLE ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING1 , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING1 , ih_rb_cntl)) {
drivers/gpu/drm/amd/amdgpu/navi10_ih.c static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) · line 136
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +2
-0@@ -125,6 +129,8 @@ static void navi10_ih_enable_interrupts(struct amdgpu_device *adev) ih_rb_cntl =RREG32_SOC15 (OSSSYS ,0 , mmIH_RB_CNTL_RING2); ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 ,RB_ENABLE ,1 ); + ih_rb_cntl =REG_SET_FIELD (ih_rb_cntl,IH_RB_CNTL_RING2 , +RB_GPU_TS_ENABLE ,1 );if (amdgpu_sriov_vf (adev) && adev->asic_type <CHIP_NAVI10 ) {if (psp_reg_program (&adev->psp,PSP_REG_IH_RB_CNTL_RING2 , ih_rb_cntl)) {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx