drm: msm: a6xx: fix debug bus register configuration
Subsystems (4)
PATCH 1/1 drm: msm: a6xx: fix debug bus register configuration
Fix the cx debugbus related register configuration, to collect accurate bus data during gpu snapshot. This helps with complete snapshot dump and also complete proper GPU recovery.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +12 -12
@@ -353,26 +353,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, cxdbg =ioremap (res->start,resource_size (res));if (cxdbg) { -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLT , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT ,A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLM , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM ,A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 ,0x76543210 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 ,0xFEDCBA98 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); } nr_debugbus_blocks = ARRAY_SIZE(a6xx_debugbus_blocks) +
--
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 6 lines · Sharat Masetty
Fix the cx debugbus related register configuration, to collect accurate bus data during gpu snapshot. This helps with complete snapshot dump and also complete proper GPU recovery.
Signed-off-by Sharat Masetty <[email protected]>
(adding fixes tag for benefit of stable kernels)
Quoted 50 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +12
-13@@ -353,26 +353,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, cxdbg =ioremap (res->start,resource_size (res));if (cxdbg) { -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLT , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT ,A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLM , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM ,A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 ,0x76543210 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 ,0xFEDCBA98 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); } nr_debugbus_blocks = ARRAY_SIZE(a6xx_debugbus_blocks) + --1.9.1
Quoted 4 lines
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Jordan Crouse
Reviewed-byQuoted 7 lines · Rob Clark
Quoted 6 lines · Sharat Masetty
Fix the cx debugbus related register configuration, to collect accurate bus data during gpu snapshot. This helps with complete snapshot dump and also complete proper GPU recovery.
Signed-off-by Sharat Masetty <[email protected]>
This commit summary is far too polite. The word boneheaded should have appeared several times. Thanks for this patch.
Quoted 3 lines
(adding fixes tag for benefit of stable kernels)
Fixes 1707add81551 ("drm/msm/a6xx: Add a6xx gpu state")
Thanks, I was going to suggest this as well.
Quoted 1 line
Reviewed-by Rob Clark <[email protected]>
Quoted 58 lines
Quoted 50 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +12
-13@@ -353,26 +353,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, cxdbg =ioremap (res->start,resource_size (res));if (cxdbg) { -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLT , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT ,A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLM , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM ,A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 ,0x76543210 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 ,0xFEDCBA98 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); } nr_debugbus_blocks = ARRAY_SIZE(a6xx_debugbus_blocks) + --1.9.1
Quoted 4 lines
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1573040963-24148-1-git-send-email-smasetty-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Sean Paul
AppliedQuoted 5 lines · Sharat Masetty
Fix the cx debugbus related register configuration, to collect accurate bus data during gpu snapshot. This helps with complete snapshot dump and also complete proper GPU recovery.
Signed-off-by Sharat Masetty <[email protected]>
Applied to drm-misc-next-fixes
Thanks,
Sean
Quoted 54 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +12
-13@@ -353,26 +353,26 @@ static void a6xx_get_debugbus(struct msm_gpu *gpu, cxdbg =ioremap (res->start,resource_size (res));if (cxdbg) { -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLT , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT ,A6XX_DBGC_CFG_DBGBUS_CNTLT_SEGT (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_CNTLM , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM ,A6XX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (0xf )); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_0 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 ,0x76543210 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_BYTEL_1 , +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 ,0xFEDCBA98 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); -cxdbg_write (cxdbg,REG_A6XX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 ,0 ); +cxdbg_write (cxdbg,REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 ,0 ); } nr_debugbus_blocks = ARRAY_SIZE(a6xx_debugbus_blocks) + --1.9.1
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno