drm/amdgpu: infinite retries fix from UTLC1 RB SDMA
Subsystems (2)
PATCH 1/1 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 Vega10, Vega12, Vega20 and Arcturus.
Signed-off-by Alex Sierra <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +17 -3
@@ -115,17 +115,21 @@ static const struct soc15_reg_golden golden_settings_sdma_4[] = {static const struct soc15_reg_golden golden_settings_sdma_vg10[] = {SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG,0x0018773f ,0x00104002 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104002 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CHICKEN_BITS,0xfe931f07 ,0x02831d07 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG,0x0018773f ,0x00104002 ), -SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104002 ) +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104002 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ), };static const struct soc15_reg_golden golden_settings_sdma_vg12[] = {SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG,0x0018773f ,0x00104001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104001 ), +SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_CHICKEN_BITS,0xfe931f07 ,0x02831d07 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG,0x0018773f ,0x00104001 ), -SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104001 ) +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_GB_ADDR_CONFIG_READ,0x0018773f ,0x00104001 ), +SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_TIMEOUT,0xffffffff ,0x00010001 ), };static const struct soc15_reg_golden golden_settings_sdma_4_1[] = {
@@ -174,6 +178,7 @@ static const struct soc15_reg_golden golden_settings_sdma0_4_2[] =SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC7_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_RLC7_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ),SOC15_REG_GOLDEN_VALUE (SDMA0 ,0 , mmSDMA0_UTCL1_PAGE,0x000003ff ,0x000003c0 ), + SOC15_REG_GOLDEN_VALUE(SDMA0, 0, mmSDMA0_UTCL1_TIMEOUT, 0xffffffff, 0x00010001), }; static const struct soc15_reg_golden golden_settings_sdma1_4_2[] = {
@@ -203,6 +208,7 @@ static const struct soc15_reg_golden golden_settings_sdma1_4_2[] = {SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC7_RB_RPTR_ADDR_LO,0xfffffffd ,0x00000001 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_RLC7_RB_WPTR_POLL_CNTL,0xfffffff7 ,0x00403000 ),SOC15_REG_GOLDEN_VALUE (SDMA1 ,0 , mmSDMA1_UTCL1_PAGE,0x000003ff ,0x000003c0 ), + SOC15_REG_GOLDEN_VALUE(SDMA1, 0, mmSDMA1_UTCL1_TIMEOUT, 0xffffffff, 0x00010001), }; static const struct soc15_reg_golden golden_settings_sdma_rv1[] =
@@ -222,27 +228,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[] = {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx