drm/amdgpu: infinite retries fix from UTLC1 RB SDMA
Subsystems (2)
PATCH 1/2 drm/amdgpu: infinite retries fix from UTLC1 RB SDMA
[Why]
Previously these registers were set to 0. This was causing an infinite retry on the UTCL1 RB, preventing higher priority RB such as paging RB.
[How]
Set to one the SDMAx_UTLC1_TIMEOUT registers for all SDMAs on Arcturus.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +9 -2
@@ -222,27 +222,35 @@ static const struct soc15_reg_golden golden_settings_sdma_arct[] =SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ), -SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ) +SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ) }; static const struct soc15_reg_golden golden_settings_sdma_4_3[] = {
@@ -2011,7 +2019,6 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev, struct amdgpu_iv_entry *entry) {uint32_t instance; -DRM_DEBUG ("IH: SDMA trap\n" ); instance =sdma_v4_0_irq_id_to_seq (entry->client_id);switch (entry->ring_id) {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: ih doorbell size of range changed for nbio v7.4
[Why]
nbio v7.4 size of ih doorbell range is 64 bit. This requires 2 DWords per register.
[How]
Change ih doorbell size from 2 to 4. This means two Dwords per ring. Current configuration uses two ih rings.
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1 -1
@@ -185,7 +185,7 @@ static void nbio_v7_4_ih_doorbell_range(struct amdgpu_device *adev,if (use_doorbell) { ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,OFFSET , doorbell_index); - ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,2 ); + ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,4 ); }else ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,0 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: ih doorbell size of range changed for nbio v7.4
Quoted 10 lines · Alex Sierra
[Why]
nbio v7.4 size of ih doorbell range is 64 bit. This requires 2 DWords per register.[How]
Change ih doorbell size from 2 to 4. This means two Dwords per ring. Current configuration uses two ih rings.Change-Id Iae28c22dd6e650f56286bfa0d9e002a8562fa855Signed-off-by Alex Sierra <[email protected]>
Series is:
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +1
-2@@ -185,7 +185,7 @@ static void nbio_v7_4_ih_doorbell_range(struct amdgpu_device *adev,if (use_doorbell) { ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,OFFSET , doorbell_index); - ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,2 ); + ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,4 ); }else ih_doorbell_range =REG_SET_FIELD (ih_doorbell_range,BIF_IH_DOORBELL_RANGE ,SIZE ,0 ); --2.17.1
Quoted 4 lines
_______________________________________________
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
Can we do similar setting for vg10 to fix infinite retry?
Philip
Quoted 55 lines · Alex Sierra
[Why]
Previously these registers were set to 0. This was causing an infinite retry on the UTCL1 RB, preventing higher priority RB such as paging RB.[How]
Set to one theSDMAx_UTLC1_TIMEOUTregisters for all SDMAs on Arcturus.Change-Id I8a6d9b89ea115fb51ff694493c88b8972d6248a5Signed-off-by Alex Sierra <[email protected]>--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +9
-1@@ -222,27 +222,35 @@ static const struct soc15_reg_golden golden_settings_sdma_arct[] =SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA2 ,0 , mmSDMA2_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA3 ,0 , mmSDMA3_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA4 ,0 , mmSDMA4_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA5 ,0 , mmSDMA5_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ),SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA6 ,0 , mmSDMA6_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_CHICKEN_BITS,0xfe931f07 ,0x02831f07 ),SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG,0x0000773f ,0x00004002 ), -SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ) +SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_GB_ADDR_CONFIG_READ,0x0000773f ,0x00004002 ), +SOC15_REG_GOLDEN_VALUE (SDMA7 ,0 , mmSDMA7_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ) }; static const struct soc15_reg_golden golden_settings_sdma_4_3[] = {
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev, · line 2024
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +0
-1@@ -2011,7 +2019,6 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev, struct amdgpu_iv_entry *entry) {uint32_t instance; -DRM_DEBUG ("IH: SDMA trap\n" ); instance =sdma_v4_0_irq_id_to_seq (entry->client_id);switch (entry->ring_id) {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx