Add a6xx GPU state capture
Subsystems (4)
cover Add a6xx GPU state capture
This stack adds support for capturing the A6xx GPU state.
The A6xx GPU state is comprehensive including registers for the GPU and the GMU, shader caches, context clusters and debugbus state.
It isn't as straightforward to capture the state as with previous targets. Some of the state is located behind apertures and other registers have special access rules so the complete state is defined by a hodgepodge of lists and structs which makes the code appear way more complex than it is.
Jordan Crouse (6):
drm/msm/a6xx: rnndb updates for a6xx
drm/msm/a6xx: Fix PDC register overlap
drm/msm/a6xx: Rename gmu phandle to qcom,gmu drm/msm/gpu: Move gpu_poll_timeout() to adreno_gpu.h drm/msm/adreno: Don't capture registers if target doesn't need them drm/msm/a6xx: Add a6xx gpu state
drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 - drivers/gpu/drm/msm/adreno/a6xx.xml.h | 642 ++++++---- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 112 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 9 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 26 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 41 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 6 + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 1159 +++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 430 +++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 19 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + 12 files changed, 2113 insertions(+), 343 deletions(-) create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20180914151935.9714-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH 1/6 drm/msm/a6xx: rnndb updates for a6xx
Update the register definitions for a6xx from the rnndb database. Changes include new enums for upcoming devcoredump support, moving the PDC and GCC_GX register definitions to their own domain and various other register updates and additions.
--- drivers/gpu/drm/msm/adreno/a6xx.xml.h | 642 ++++++++++++++-------- drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 26 +- 2 files changed, 416 insertions(+), 252 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx.xml.h +403 -239
@@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: -- /home/robclark/src/envytools/rnndb/adreno.xml ( 501 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 101627 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes, from 2018-07-03 19:37:13) +- ./adreno.xml ( 501 bytes, from 2018-05-23 16:51:57) +- ./freedreno_copyright.xml ( 1572 bytes, from 2016-10-24 21:12:27) +- ./adreno/a2xx.xml ( 36805 bytes, from 2018-05-23 16:51:57) +- ./adreno/adreno_common.xml ( 13634 bytes, from 2018-05-23 16:51:57) +- ./adreno/adreno_pm4.xml ( 42393 bytes, from 2018-08-16 16:56:14) +- ./adreno/a3xx.xml ( 83840 bytes, from 2017-12-05 18:20:27) +- ./adreno/a4xx.xml ( 112086 bytes, from 2018-05-23 16:51:57) +- ./adreno/a5xx.xml ( 147240 bytes, from 2018-08-16 16:56:14) +- ./adreno/a6xx.xml ( 107521 bytes, from 2018-08-16 17:44:50) +- ./adreno/a6xx_gmu.xml ( 10431 bytes, from 2018-08-16 17:44:26) +- ./adreno/ocmem.xml ( 1773 bytes, from 2016-10-24 21:12:27) Copyright (C) 2013-2018 by the following authors: - Rob Clark <[email protected]> (robclark)
@@ -272,6 +272,98 @@ enum a6xx_cp_perfcounter_select { PERF_CP_ALWAYS_COUNT = 0, }; +enum a6xx_shader_id { +A6XX_TP0_TMO_DATA =9 , +A6XX_TP0_SMO_DATA =10 , +A6XX_TP0_MIPMAP_BASE_DATA =11 , +A6XX_TP1_TMO_DATA =25 , +A6XX_TP1_SMO_DATA =26 , +A6XX_TP1_MIPMAP_BASE_DATA =27 , +A6XX_SP_INST_DATA =41 , +A6XX_SP_LB_0_DATA =42 , +A6XX_SP_LB_1_DATA =43 , +A6XX_SP_LB_2_DATA =44 , +A6XX_SP_LB_3_DATA =45 , +A6XX_SP_LB_4_DATA =46 , +A6XX_SP_LB_5_DATA =47 , +A6XX_SP_CB_BINDLESS_DATA =48 , +A6XX_SP_CB_LEGACY_DATA =49 , +A6XX_SP_UAV_DATA =50 , +A6XX_SP_INST_TAG =51 , +A6XX_SP_CB_BINDLESS_TAG =52 , +A6XX_SP_TMO_UMO_TAG =53 , +A6XX_SP_SMO_TAG =54 , +A6XX_SP_STATE_DATA =55 , +A6XX_HLSQ_CHUNK_CVS_RAM =73 , +A6XX_HLSQ_CHUNK_CPS_RAM =74 , +A6XX_HLSQ_CHUNK_CVS_RAM_TAG =75 , +A6XX_HLSQ_CHUNK_CPS_RAM_TAG =76 , +A6XX_HLSQ_ICB_CVS_CB_BASE_TAG =77 , +A6XX_HLSQ_ICB_CPS_CB_BASE_TAG =78 , +A6XX_HLSQ_CVS_MISC_RAM =80 , +A6XX_HLSQ_CPS_MISC_RAM =81 , +A6XX_HLSQ_INST_RAM =82 , +A6XX_HLSQ_GFX_CVS_CONST_RAM =83 , +A6XX_HLSQ_GFX_CPS_CONST_RAM =84 , +A6XX_HLSQ_CVS_MISC_RAM_TAG =85 , +A6XX_HLSQ_CPS_MISC_RAM_TAG =86 , +A6XX_HLSQ_INST_RAM_TAG =87 , +A6XX_HLSQ_GFX_CVS_CONST_RAM_TAG =88 , +A6XX_HLSQ_GFX_CPS_CONST_RAM_TAG =89 , +A6XX_HLSQ_PWR_REST_RAM =90 , +A6XX_HLSQ_PWR_REST_TAG =91 , +A6XX_HLSQ_DATAPATH_META =96 , +A6XX_HLSQ_FRONTEND_META =97 , +A6XX_HLSQ_INDIRECT_META =98 , +A6XX_HLSQ_BACKEND_META =99 , +}; + +enum a6xx_debugbus_id { +A6XX_DBGBUS_CP =1 , +A6XX_DBGBUS_RBBM =2 , +A6XX_DBGBUS_VBIF =3 , +A6XX_DBGBUS_HLSQ =4 , +A6XX_DBGBUS_UCHE =5 , +A6XX_DBGBUS_DPM =6 , +A6XX_DBGBUS_TESS =7 , +A6XX_DBGBUS_PC =8 , +A6XX_DBGBUS_VFDP =9 , +A6XX_DBGBUS_VPC =10 , +A6XX_DBGBUS_TSE =11 , +A6XX_DBGBUS_RAS =12 , +A6XX_DBGBUS_VSC =13 , +A6XX_DBGBUS_COM =14 , +A6XX_DBGBUS_LRZ =16 , +A6XX_DBGBUS_A2D =17 , +A6XX_DBGBUS_CCUFCHE =18 , +A6XX_DBGBUS_GMU_CX =19 , +A6XX_DBGBUS_RBP =20 , +A6XX_DBGBUS_DCS =21 , +A6XX_DBGBUS_DBGC =22 , +A6XX_DBGBUS_CX =23 , +A6XX_DBGBUS_GMU_GX =24 , +A6XX_DBGBUS_TPFCHE =25 , +A6XX_DBGBUS_GBIF_GX =26 , +A6XX_DBGBUS_GPC =29 , +A6XX_DBGBUS_LARC =30 , +A6XX_DBGBUS_HLSQ_SPTP =31 , +A6XX_DBGBUS_RB_0 =32 , +A6XX_DBGBUS_RB_1 =33 , +A6XX_DBGBUS_UCHE_WRAPPER =36 , +A6XX_DBGBUS_CCU_0 =40 , +A6XX_DBGBUS_CCU_1 =41 , +A6XX_DBGBUS_VFD_0 =56 , +A6XX_DBGBUS_VFD_1 =57 , +A6XX_DBGBUS_VFD_2 =58 , +A6XX_DBGBUS_VFD_3 =59 , +A6XX_DBGBUS_SP_0 =64 , +A6XX_DBGBUS_SP_1 =65 , +A6XX_DBGBUS_TPL1_0 =72 , +A6XX_DBGBUS_TPL1_1 =73 , +A6XX_DBGBUS_TPL1_2 =74 , +A6XX_DBGBUS_TPL1_3 =75 , +}; +enum a6xx_tex_filter {A6XX_TEX_NEAREST =0 ,A6XX_TEX_LINEAR =1 ,
@@ -1765,12 +1857,39 @@ static inline uint32_t A6XX_UCHE_CLIENT_PF_PERFSEL(uint32_t val)#define REG_A6XX_VBIF_VERSION 0x00003000 +#define REG_A6XX_VBIF_CLKON 0x00003001 +#define A6XX_VBIF_CLKON_FORCE_ON_TESTBUS 0x00000002 +#define REG_A6XX_VBIF_GATE_OFF_WRREQ_EN 0x0000302a#define REG_A6XX_VBIF_XIN_HALT_CTRL0 0x00003080#define REG_A6XX_VBIF_XIN_HALT_CTRL1 0x00003081 +#define REG_A6XX_VBIF_TEST_BUS_OUT_CTRL 0x00003084 + +#define REG_A6XX_VBIF_TEST_BUS1_CTRL0 0x00003085 + +#define REG_A6XX_VBIF_TEST_BUS1_CTRL1 0x00003086 +#define A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL__MASK 0x0000000f +#define A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL__SHIFT 0 +static inline uint32_t A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL (uint32_t val) +{ +return ((val) <<A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL__SHIFT ) &A6XX_VBIF_TEST_BUS1_CTRL1_DATA_SEL__MASK ; +} + +#define REG_A6XX_VBIF_TEST_BUS2_CTRL0 0x00003087 + +#define REG_A6XX_VBIF_TEST_BUS2_CTRL1 0x00003088 +#define A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL__MASK 0x000001ff +#define A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL__SHIFT 0 +static inline uint32_t A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL (uint32_t val) +{ +return ((val) <<A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL__SHIFT ) &A6XX_VBIF_TEST_BUS2_CTRL1_DATA_SEL__MASK ; +} + +#define REG_A6XX_VBIF_TEST_BUS_OUT 0x0000308c +#define REG_A6XX_VBIF_PERF_CNT_SEL0 0x000030d0#define REG_A6XX_VBIF_PERF_CNT_SEL1 0x000030d1
@@ -1813,228 +1932,6 @@ static inline uint32_t A6XX_UCHE_CLIENT_PF_PERFSEL(uint32_t val)#define REG_A6XX_VBIF_PERF_PWR_CNT_HIGH2 0x0000311a -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_A 0x00018400 - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_B 0x00018401 - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_C 0x00018402 - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_D 0x00018403 -#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX__MASK 0x000000ff -#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX__SHIFT 0 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_INDEX__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL__MASK 0x0000ff00 -#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL__SHIFT 8 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_SEL_D_PING_BLK_SEL__MASK ; -} - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT 0x00018404 -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__MASK 0x0000003f -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__SHIFT 0 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__MASK 0x00007000 -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__SHIFT 12 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__MASK 0xf0000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__SHIFT 28 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__MASK ; -} - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM 0x00018405 -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__MASK 0x0f000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__SHIFT 24 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__MASK ; -} - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 0x00018408 - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 0x00018409 - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 0x0001840a - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 0x0001840b - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 0x0001840c - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 0x0001840d - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 0x0001840e - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 0x0001840f - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 0x00018410 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__MASK 0x0000000f -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__SHIFT 0 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__MASK 0x000000f0 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__SHIFT 4 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__MASK 0x00000f00 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__SHIFT 8 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__MASK 0x0000f000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__SHIFT 12 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__MASK 0x000f0000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__SHIFT 16 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__MASK 0x00f00000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__SHIFT 20 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__MASK 0x0f000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__SHIFT 24 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__MASK 0xf0000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__SHIFT 28 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__MASK ; -} - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 0x00018411 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__MASK 0x0000000f -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__SHIFT 0 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__MASK 0x000000f0 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__SHIFT 4 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__MASK 0x00000f00 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__SHIFT 8 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__MASK 0x0000f000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__SHIFT 12 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__MASK 0x000f0000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__SHIFT 16 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__MASK 0x00f00000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__SHIFT 20 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__MASK 0x0f000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__SHIFT 24 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__MASK ; -} -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__MASK 0xf0000000 -#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__SHIFT 28 -static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15 (uint32_t val) -{ -return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__MASK ; -} - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF1 0x0001842f - -#define REG_A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2 0x00018430 - -#define REG_A6XX_PDC_GPU_ENABLE_PDC 0x00021140 - -#define REG_A6XX_PDC_GPU_SEQ_START_ADDR 0x00021148 - -#define REG_A6XX_PDC_GPU_TCS0_CONTROL 0x00021540 - -#define REG_A6XX_PDC_GPU_TCS0_CMD_ENABLE_BANK 0x00021541 - -#define REG_A6XX_PDC_GPU_TCS0_CMD_WAIT_FOR_CMPL_BANK 0x00021542 - -#define REG_A6XX_PDC_GPU_TCS0_CMD0_MSGID 0x00021543 - -#define REG_A6XX_PDC_GPU_TCS0_CMD0_ADDR 0x00021544 - -#define REG_A6XX_PDC_GPU_TCS0_CMD0_DATA 0x00021545 - -#define REG_A6XX_PDC_GPU_TCS1_CONTROL 0x00021572 - -#define REG_A6XX_PDC_GPU_TCS1_CMD_ENABLE_BANK 0x00021573 - -#define REG_A6XX_PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK 0x00021574 - -#define REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID 0x00021575 - -#define REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR 0x00021576 - -#define REG_A6XX_PDC_GPU_TCS1_CMD0_DATA 0x00021577 - -#define REG_A6XX_PDC_GPU_TCS2_CONTROL 0x000215a4 - -#define REG_A6XX_PDC_GPU_TCS2_CMD_ENABLE_BANK 0x000215a5 - -#define REG_A6XX_PDC_GPU_TCS2_CMD_WAIT_FOR_CMPL_BANK 0x000215a6 - -#define REG_A6XX_PDC_GPU_TCS2_CMD0_MSGID 0x000215a7 - -#define REG_A6XX_PDC_GPU_TCS2_CMD0_ADDR 0x000215a8 - -#define REG_A6XX_PDC_GPU_TCS2_CMD0_DATA 0x000215a9 - -#define REG_A6XX_PDC_GPU_TCS3_CONTROL 0x000215d6 - -#define REG_A6XX_PDC_GPU_TCS3_CMD_ENABLE_BANK 0x000215d7 - -#define REG_A6XX_PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK 0x000215d8 - -#define REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID 0x000215d9 - -#define REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR 0x000215da - -#define REG_A6XX_PDC_GPU_TCS3_CMD0_DATA 0x000215db - -#define REG_A6XX_PDC_GPU_SEQ_MEM_0 0x000a0000 -#define REG_A6XX_X1_WINDOW_OFFSET 0x000088d4#define A6XX_X1_WINDOW_OFFSET_WINDOW_OFFSET_DISABLE 0x80000000#define A6XX_X1_WINDOW_OFFSET_X__MASK 0x00007fff
@@ -2200,6 +2097,8 @@ static inline uint32_t REG_A6XX_VSC_SIZE_REG(uint32_t i0) { return 0x00000c78 +#define REG_A6XX_UCHE_UNKNOWN_0E12 0x00000e12 +#define REG_A6XX_GRAS_UNKNOWN_8000 0x00008000 +#define REG_A6XX_GRAS_UNKNOWN_8001 0x00008001#define REG_A6XX_GRAS_UNKNOWN_8004 0x00008004
@@ -2344,6 +2243,8 @@ static inline uint32_t A6XX_GRAS_SU_DEPTH_BUFFER_INFO_DEPTH_FORMAT(enum a6xx_dep#define REG_A6XX_GRAS_UNKNOWN_809B 0x0000809b +#define REG_A6XX_GRAS_UNKNOWN_80A0 0x000080a0 +#define REG_A6XX_GRAS_RAS_MSAA_CNTL 0x000080a2#define A6XX_GRAS_RAS_MSAA_CNTL_SAMPLES__MASK 0x00000003#define A6XX_GRAS_RAS_MSAA_CNTL_SAMPLES__SHIFT 0
@@ -2464,6 +2365,8 @@ static inline uint32_t A6XX_GRAS_SC_WINDOW_SCISSOR_BR_Y(uint32_t val)#define A6XX_GRAS_LRZ_CNTL_LRZ_WRITE 0x00000002#define A6XX_GRAS_LRZ_CNTL_GREATER 0x00000004 +#define REG_A6XX_GRAS_UNKNOWN_8101 0x00008101 +#define REG_A6XX_GRAS_2D_BLIT_INFO 0x00008102#define A6XX_GRAS_2D_BLIT_INFO_COLOR_FORMAT__MASK 0x000000ff#define A6XX_GRAS_2D_BLIT_INFO_COLOR_FORMAT__SHIFT 0
@@ -2494,6 +2397,10 @@ static inline uint32_t A6XX_GRAS_LRZ_BUFFER_PITCH_ARRAY_PITCH(uint32_t val)#define REG_A6XX_GRAS_LRZ_FAST_CLEAR_BUFFER_BASE_HI 0x00008107 +#define REG_A6XX_GRAS_UNKNOWN_8109 0x00008109 + +#define REG_A6XX_GRAS_UNKNOWN_8110 0x00008110 +#define REG_A6XX_GRAS_2D_BLIT_CNTL 0x00008400#define REG_A6XX_GRAS_2D_SRC_TL_X 0x00008401
@@ -2747,6 +2654,10 @@ static inline uint32_t A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT7(enum adreno_rb_dithe#define A6XX_RB_SRGB_CNTL_SRGB_MRT6 0x00000040#define A6XX_RB_SRGB_CNTL_SRGB_MRT7 0x00000080 +#define REG_A6XX_RB_UNKNOWN_8810 0x00008810 + +#define REG_A6XX_RB_UNKNOWN_8811 0x00008811 +#define REG_A6XX_RB_UNKNOWN_8818 0x00008818#define REG_A6XX_RB_UNKNOWN_8819 0x00008819
@@ -3177,14 +3088,14 @@ static inline uint32_t A6XX_RB_BLIT_DST_ARRAY_PITCH(uint32_t val)#define REG_A6XX_RB_BLIT_INFO 0x000088e3#define A6XX_RB_BLIT_INFO_UNK0 0x00000001 -#define A6XX_RB_BLIT_INFO_FAST_CLEAR 0x00000002 +#define A6XX_RB_BLIT_INFO_GMEM 0x00000002#define A6XX_RB_BLIT_INFO_INTEGER 0x00000004 -#define A6XX_RB_BLIT_INFO_UNK3 0x00000008 -#define A6XX_RB_BLIT_INFO_MASK__MASK 0x000000f0 -#define A6XX_RB_BLIT_INFO_MASK__SHIFT 4 -static inline uint32_t A6XX_RB_BLIT_INFO_MASK (uint32_t val) +#define A6XX_RB_BLIT_INFO_DEPTH 0x00000008 +#define A6XX_RB_BLIT_INFO_CLEAR_MASK__MASK 0x000000f0 +#define A6XX_RB_BLIT_INFO_CLEAR_MASK__SHIFT 4 +static inline uint32_t A6XX_RB_BLIT_INFO_CLEAR_MASK (uint32_t val) { -return ((val) <<A6XX_RB_BLIT_INFO_MASK__SHIFT ) &A6XX_RB_BLIT_INFO_MASK__MASK ; +return ((val) <<A6XX_RB_BLIT_INFO_CLEAR_MASK__SHIFT ) &A6XX_RB_BLIT_INFO_CLEAR_MASK__MASK ; }#define REG_A6XX_RB_UNKNOWN_88F0 0x000088f0
@@ -3274,12 +3185,16 @@ static inline uint32_t A6XX_RB_2D_DST_SIZE_PITCH(uint32_t val)#define REG_A6XX_RB_UNKNOWN_8E01 0x00008e01 +#define REG_A6XX_RB_UNKNOWN_8E04 0x00008e04 +#define REG_A6XX_RB_CCU_CNTL 0x00008e07#define REG_A6XX_VPC_UNKNOWN_9101 0x00009101#define REG_A6XX_VPC_GS_SIV_CNTL 0x00009104 +#define REG_A6XX_VPC_UNKNOWN_9107 0x00009107 +#define REG_A6XX_VPC_UNKNOWN_9108 0x00009108static inline uint32_t REG_A6XX_VPC_VARYING_INTERP (uint32_t i0) {return 0x00009200 +0x1 *i0; }
@@ -3385,6 +3300,8 @@ static inline uint32_t A6XX_VPC_CNTL_0_NUMNONPOSVAR(uint32_t val)#define A6XX_VPC_SO_BUF_CNTL_BUF3 0x00000200#define A6XX_VPC_SO_BUF_CNTL_ENABLE 0x00008000 +#define REG_A6XX_VPC_UNKNOWN_9306 0x00009306 +#define REG_A6XX_VPC_UNKNOWN_9600 0x00009600#define REG_A6XX_VPC_UNKNOWN_9602 0x00009602
@@ -3397,8 +3314,14 @@ static inline uint32_t A6XX_VPC_CNTL_0_NUMNONPOSVAR(uint32_t val)#define REG_A6XX_PC_UNKNOWN_9805 0x00009805 +#define REG_A6XX_PC_UNKNOWN_9806 0x00009806 + +#define REG_A6XX_PC_UNKNOWN_9980 0x00009980 +#define REG_A6XX_PC_UNKNOWN_9981 0x00009981 +#define REG_A6XX_PC_UNKNOWN_9990 0x00009990 +#define REG_A6XX_PC_PRIMITIVE_CNTL_0 0x00009b00#define A6XX_PC_PRIMITIVE_CNTL_0_PRIMITIVE_RESTART 0x00000001#define A6XX_PC_PRIMITIVE_CNTL_0_PROVOKING_VTX_LAST 0x00000002
@@ -3410,6 +3333,7 @@ static inline uint32_t A6XX_PC_PRIMITIVE_CNTL_1_STRIDE_IN_VPC(uint32_t val) {return ((val) <<A6XX_PC_PRIMITIVE_CNTL_1_STRIDE_IN_VPC__SHIFT ) &A6XX_PC_PRIMITIVE_CNTL_1_STRIDE_IN_VPC__MASK ; } +#define A6XX_PC_PRIMITIVE_CNTL_1_PSIZE 0x00000100#define REG_A6XX_PC_UNKNOWN_9B06 0x00009b06
@@ -3488,6 +3412,8 @@ static inline uint32_t A6XX_VFD_CONTROL_3_REGID_TESSY(uint32_t val)#define REG_A6XX_VFD_UNKNOWN_A008 0x0000a008 +#define REG_A6XX_VFD_UNKNOWN_A009 0x0000a009 +#define REG_A6XX_VFD_INDEX_OFFSET 0x0000a00e#define REG_A6XX_VFD_INSTANCE_START_OFFSET 0x0000a00f
@@ -3640,6 +3566,8 @@ static inline uint32_t A6XX_SP_VS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)#define A6XX_SP_VS_CTRL_REG0_PIXLODENABLE 0x04000000#define A6XX_SP_VS_CTRL_REG0_MERGEDREGS 0x80000000 +#define REG_A6XX_SP_UNKNOWN_A81B 0x0000a81b +#define REG_A6XX_SP_VS_OBJ_START_LO 0x0000a81c#define REG_A6XX_SP_VS_OBJ_START_HI 0x0000a81d
@@ -3884,6 +3812,8 @@ static inline uint32_t A6XX_SP_FS_CTRL_REG0_THREADSIZE(enum a3xx_threadsize val)#define A6XX_SP_FS_CTRL_REG0_PIXLODENABLE 0x04000000#define A6XX_SP_FS_CTRL_REG0_MERGEDREGS 0x80000000 +#define REG_A6XX_SP_UNKNOWN_A982 0x0000a982 +#define REG_A6XX_SP_FS_OBJ_START_LO 0x0000a983#define REG_A6XX_SP_FS_OBJ_START_HI 0x0000a984
@@ -3981,6 +3911,8 @@ static inline uint32_t A6XX_SP_FS_MRT_REG_COLOR_FORMAT(enum a6xx_color_fmt val)#define A6XX_SP_FS_MRT_REG_COLOR_UINT 0x00000200#define A6XX_SP_FS_MRT_REG_COLOR_SRGB 0x00000400 +#define REG_A6XX_SP_UNKNOWN_A99E 0x0000a99e +#define REG_A6XX_SP_FS_TEX_COUNT 0x0000a9a7#define REG_A6XX_SP_UNKNOWN_A9A8 0x0000a9a8
@@ -4066,14 +3998,20 @@ static inline uint32_t A6XX_SP_FS_CONFIG_NSAMP(uint32_t val)#define REG_A6XX_SP_FS_INSTRLEN 0x0000ab05 +#define REG_A6XX_SP_UNKNOWN_AB20 0x0000ab20 +#define REG_A6XX_SP_UNKNOWN_AE00 0x0000ae00 +#define REG_A6XX_SP_UNKNOWN_AE03 0x0000ae03 +#define REG_A6XX_SP_UNKNOWN_AE04 0x0000ae04#define REG_A6XX_SP_UNKNOWN_AE0F 0x0000ae0f#define REG_A6XX_SP_UNKNOWN_B182 0x0000b182 +#define REG_A6XX_SP_UNKNOWN_B183 0x0000b183 +#define REG_A6XX_SP_TP_RAS_MSAA_CNTL 0x0000b300#define A6XX_SP_TP_RAS_MSAA_CNTL_SAMPLES__MASK 0x00000003#define A6XX_SP_TP_RAS_MSAA_CNTL_SAMPLES__SHIFT 0
@@ -4097,6 +4035,8 @@ static inline uint32_t A6XX_SP_TP_DEST_MSAA_CNTL_SAMPLES(enum a3xx_msaa_samples#define REG_A6XX_SP_TP_UNKNOWN_B304 0x0000b304 +#define REG_A6XX_SP_TP_UNKNOWN_B309 0x0000b309 +#define REG_A6XX_SP_PS_2D_SRC_INFO 0x0000b4c0#define A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT__MASK 0x000000ff#define A6XX_SP_PS_2D_SRC_INFO_COLOR_FORMAT__SHIFT 0
@@ -4162,6 +4102,8 @@ static inline uint32_t A6XX_HLSQ_GS_CNTL_CONSTLEN(uint32_t val)return ((val >>2 ) <<A6XX_HLSQ_GS_CNTL_CONSTLEN__SHIFT ) &A6XX_HLSQ_GS_CNTL_CONSTLEN__MASK ; } +#define REG_A6XX_HLSQ_UNKNOWN_B980 0x0000b980 +#define REG_A6XX_HLSQ_CONTROL_1_REG 0x0000b982#define REG_A6XX_HLSQ_CONTROL_2_REG 0x0000b983
@@ -4558,5 +4500,227 @@ static inline uint32_t A6XX_TEX_CONST_8_BASE_HI(uint32_t val)#define REG_A6XX_TEX_CONST_15 0x0000000f +#define REG_A6XX_PDC_GPU_ENABLE_PDC 0x00001140 + +#define REG_A6XX_PDC_GPU_SEQ_START_ADDR 0x00001148 + +#define REG_A6XX_PDC_GPU_TCS0_CONTROL 0x00001540 + +#define REG_A6XX_PDC_GPU_TCS0_CMD_ENABLE_BANK 0x00001541 + +#define REG_A6XX_PDC_GPU_TCS0_CMD_WAIT_FOR_CMPL_BANK 0x00001542 + +#define REG_A6XX_PDC_GPU_TCS0_CMD0_MSGID 0x00001543 + +#define REG_A6XX_PDC_GPU_TCS0_CMD0_ADDR 0x00001544 + +#define REG_A6XX_PDC_GPU_TCS0_CMD0_DATA 0x00001545 + +#define REG_A6XX_PDC_GPU_TCS1_CONTROL 0x00001572 + +#define REG_A6XX_PDC_GPU_TCS1_CMD_ENABLE_BANK 0x00001573 + +#define REG_A6XX_PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK 0x00001574 + +#define REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID 0x00001575 + +#define REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR 0x00001576 + +#define REG_A6XX_PDC_GPU_TCS1_CMD0_DATA 0x00001577 + +#define REG_A6XX_PDC_GPU_TCS2_CONTROL 0x000015a4 + +#define REG_A6XX_PDC_GPU_TCS2_CMD_ENABLE_BANK 0x000015a5 + +#define REG_A6XX_PDC_GPU_TCS2_CMD_WAIT_FOR_CMPL_BANK 0x000015a6 + +#define REG_A6XX_PDC_GPU_TCS2_CMD0_MSGID 0x000015a7 + +#define REG_A6XX_PDC_GPU_TCS2_CMD0_ADDR 0x000015a8 + +#define REG_A6XX_PDC_GPU_TCS2_CMD0_DATA 0x000015a9 + +#define REG_A6XX_PDC_GPU_TCS3_CONTROL 0x000015d6 + +#define REG_A6XX_PDC_GPU_TCS3_CMD_ENABLE_BANK 0x000015d7 + +#define REG_A6XX_PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK 0x000015d8 + +#define REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID 0x000015d9 + +#define REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR 0x000015da + +#define REG_A6XX_PDC_GPU_TCS3_CMD0_DATA 0x000015db + +#define REG_A6XX_PDC_GPU_SEQ_MEM_0 0x00000000 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_A 0x00000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX__MASK 0x000000ff +#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX__SHIFT 0 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_INDEX__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL__MASK 0x0000ff00 +#define A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL__SHIFT 8 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_SEL_A_PING_BLK_SEL__MASK ; +} + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_B 0x00000001 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_C 0x00000002 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_SEL_D 0x00000003 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLT 0x00000004 +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__MASK 0x0000003f +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__SHIFT 0 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_TRACEEN__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__MASK 0x00007000 +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__SHIFT 12 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_GRANU__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__MASK 0xf0000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__SHIFT 28 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLT_SEGT__MASK ; +} + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_CNTLM 0x00000005 +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__MASK 0x0f000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__SHIFT 24 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_CNTLM_ENABLE__MASK ; +} + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_0 0x00000008 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_1 0x00000009 + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_2 0x0000000a + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_IVTL_3 0x0000000b + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_0 0x0000000c + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_1 0x0000000d + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_2 0x0000000e + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_MASKL_3 0x0000000f + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0 0x00000010 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__MASK 0x0000000f +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__SHIFT 0 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL0__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__MASK 0x000000f0 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__SHIFT 4 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL1__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__MASK 0x00000f00 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__SHIFT 8 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL2__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__MASK 0x0000f000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__SHIFT 12 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL3__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__MASK 0x000f0000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__SHIFT 16 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL4__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__MASK 0x00f00000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__SHIFT 20 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL5__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__MASK 0x0f000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__SHIFT 24 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL6__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__MASK 0xf0000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__SHIFT 28 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_0_BYTEL7__MASK ; +} + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1 0x00000011 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__MASK 0x0000000f +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__SHIFT 0 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL8__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__MASK 0x000000f0 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__SHIFT 4 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL9__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__MASK 0x00000f00 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__SHIFT 8 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL10__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__MASK 0x0000f000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__SHIFT 12 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL11__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__MASK 0x000f0000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__SHIFT 16 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL12__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__MASK 0x00f00000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__SHIFT 20 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL13__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__MASK 0x0f000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__SHIFT 24 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL14__MASK ; +} +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__MASK 0xf0000000 +#define A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__SHIFT 28 +static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15 (uint32_t val) +{ +return ((val) <<A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__SHIFT ) &A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15__MASK ; +} + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF1 0x0000002f + +#define REG_A6XX_CX_DBGC_CFG_DBGBUS_TRACE_BUF2 0x00000030 +#endif /* A6XX_XML */
drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h +13 -13
@@ -8,17 +8,17 @@ This file was generated by the rules-ng-ng headergen tool in this git repository git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: -- /home/robclark/src/envytools/rnndb/adreno.xml ( 501 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/freedreno_copyright.xml ( 1572 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a2xx.xml ( 36805 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/adreno_common.xml ( 13634 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/adreno_pm4.xml ( 42393 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a3xx.xml ( 83840 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a4xx.xml ( 112086 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/a5xx.xml ( 147240 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a6xx.xml ( 101627 bytes, from 2018-08-06 18:45:45) -- /home/robclark/src/envytools/rnndb/adreno/a6xx_gmu.xml ( 10431 bytes, from 2018-07-03 19:37:13) -- /home/robclark/src/envytools/rnndb/adreno/ocmem.xml ( 1773 bytes, from 2018-07-03 19:37:13) +- ./adreno.xml ( 501 bytes, from 2018-05-23 16:51:57) +- ./freedreno_copyright.xml ( 1572 bytes, from 2016-10-24 21:12:27) +- ./adreno/a2xx.xml ( 36805 bytes, from 2018-05-23 16:51:57) +- ./adreno/adreno_common.xml ( 13634 bytes, from 2018-05-23 16:51:57) +- ./adreno/adreno_pm4.xml ( 42393 bytes, from 2018-08-16 16:56:14) +- ./adreno/a3xx.xml ( 83840 bytes, from 2017-12-05 18:20:27) +- ./adreno/a4xx.xml ( 112086 bytes, from 2018-05-23 16:51:57) +- ./adreno/a5xx.xml ( 147240 bytes, from 2018-08-16 16:56:14) +- ./adreno/a6xx.xml ( 107570 bytes, from 2018-08-16 17:32:18) +- ./adreno/a6xx_gmu.xml ( 10431 bytes, from 2018-08-16 17:35:55) +- ./adreno/ocmem.xml ( 1773 bytes, from 2016-10-24 21:12:27) Copyright (C) 2013-2018 by the following authors: - Rob Clark <[email protected]> (robclark)
@@ -167,8 +167,8 @@ static inline uint32_t A6XX_GMU_PWR_COL_INTER_FRAME_CTRL_MIN_PASS_LENGTH(uint32_#define REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS 0x000050d0#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWERING_OFF 0x00000001#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWERING_ON 0x00000002 -#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWER_ON 0x00000004 -#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWER_OFF 0x00000008 +#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWER_OFF 0x00000004 +#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWER_ON 0x00000008#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SP_CLOCK_OFF 0x00000010#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GMU_UP_POWER_STATE 0x00000020#define A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF 0x00000040
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 2/6 drm/msm/a6xx: Fix PDC register overlap
In reply to a message not in the archiveThe current design greedily takes a big chunk of the PDC register space instead of just the GPU specific sections which conflicts with other drivers and generally makes a mess of things.
Furthermore we only need to map the GPU PDC sections just once during init so map the memory inside the function that uses it.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 87 ++++++++++++++++----------- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 6 -- 2 files changed, 51 insertions(+), 42 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +51 -36
@@ -348,8 +348,23 @@ static void a6xx_rpmh_stop(struct a6xx_gmu *gmu)gmu_write (gmu,REG_A6XX_GMU_RSCC_CONTROL_REQ ,0 ); } +static inline void pdc_write (void __iomem *ptr,u32 offset,u32 value) +{ +return msm_writel (value, ptr + (offset <<2 )); +} + +static void __iomem *a6xx_gmu_get_mmio (struct platform_device *pdev, +const char *name); +static void a6xx_gmu_rpmh_init (struct a6xx_gmu *gmu) { +struct platform_device *pdev =to_platform_device (gmu->dev); +void __iomem *pdcptr =a6xx_gmu_get_mmio (pdev,"gmu_pdc" ); +void __iomem *seqptr =a6xx_gmu_get_mmio (pdev,"gmu_pdc_seq" ); + +if (!pdcptr || !seqptr) + goto err; +/* Disable SDE clock gating */ gmu_write (gmu,REG_A6XX_GPU_RSCC_RSC_STATUS0_DRV0 ,BIT (24 ));
@@ -374,44 +389,48 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)gmu_write (gmu,REG_A6XX_RSCC_SEQ_MEM_0_DRV0 +4 ,0x0020e8a8 );/* Load PDC sequencer uCode for power up and power down sequence */ -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_MEM_0 ,0xfebea1e1 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_MEM_0 +1 ,0xa5a4a3a2 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_MEM_0 +2 ,0x8382a6e0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_MEM_0 +3 ,0xbce3e284 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_MEM_0 +4 ,0x002081fc ); +pdc_write (seqptr,REG_A6XX_PDC_GPU_SEQ_MEM_0 ,0xfebea1e1 ); +pdc_write (seqptr,REG_A6XX_PDC_GPU_SEQ_MEM_0 +1 ,0xa5a4a3a2 ); +pdc_write (seqptr,REG_A6XX_PDC_GPU_SEQ_MEM_0 +2 ,0x8382a6e0 ); +pdc_write (seqptr,REG_A6XX_PDC_GPU_SEQ_MEM_0 +3 ,0xbce3e284 ); +pdc_write (seqptr,REG_A6XX_PDC_GPU_SEQ_MEM_0 +4 ,0x002081fc );/* Set TCS commands used by PDC sequence for low power modes */ -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD_ENABLE_BANK ,7 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK ,0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CONTROL ,0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR ,0x30010 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA ,1 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID +4 ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR +4 ,0x30000 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA +4 ,0x0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID +8 ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR +8 ,0x30080 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA +8 ,0x0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD_ENABLE_BANK ,7 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK ,0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CONTROL ,0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR ,0x30010 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA ,2 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID +4 ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR +4 ,0x30000 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA +4 ,0x3 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID +8 ,0x10108 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR +8 ,0x30080 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA +8 ,0x3 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD_ENABLE_BANK ,7 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK ,0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CONTROL ,0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR ,0x30010 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA ,1 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID +4 ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR +4 ,0x30000 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA +4 ,0x0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_MSGID +8 ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_ADDR +8 ,0x30080 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS1_CMD0_DATA +8 ,0x0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD_ENABLE_BANK ,7 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK ,0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CONTROL ,0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR ,0x30010 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA ,2 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID +4 ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR +4 ,0x30000 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA +4 ,0x3 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_MSGID +8 ,0x10108 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_ADDR +8 ,0x30080 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_TCS3_CMD0_DATA +8 ,0x3 );/* Setup GPU PDC */ -pdc_write (gmu,REG_A6XX_PDC_GPU_SEQ_START_ADDR ,0 ); -pdc_write (gmu,REG_A6XX_PDC_GPU_ENABLE_PDC ,0x80000001 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_SEQ_START_ADDR ,0 ); +pdc_write (pdcptr,REG_A6XX_PDC_GPU_ENABLE_PDC ,0x80000001 );/* ensure no writes happen before the uCode is fully written */ wmb (); + +err: +devm_iounmap (gmu->dev, pdcptr); +devm_iounmap (gmu->dev, seqptr); }/*
@@ -1170,11 +1189,7 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Map the GMU registers */ gmu->mmio =a6xx_gmu_get_mmio (pdev,"gmu" ); - -/* Map the GPU power domain controller registers */ - gmu->pdc_mmio =a6xx_gmu_get_mmio (pdev,"gmu_pdc" ); - -if (IS_ERR (gmu->mmio) ||IS_ERR (gmu->pdc_mmio)) +if (IS_ERR (gmu->mmio)) goto err;/* Get the HFI and GMU interrupts */
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +0 -6
@@ -47,7 +47,6 @@ struct a6xx_gmu {struct device *dev;void *__iomem mmio; -void *__iomem pdc_mmio;int hfi_irq;int gmu_irq;
@@ -89,11 +88,6 @@ static inline void gmu_write(struct a6xx_gmu *gmu, u32 offset, u32 value)return msm_writel (value, gmu->mmio + (offset <<2 )); } -static inline void pdc_write (struct a6xx_gmu *gmu,u32 offset,u32 value) -{ -return msm_writel (value, gmu->pdc_mmio + (offset <<2 )); -} -static inline void gmu_rmw (struct a6xx_gmu *gmu,u32 reg,u32 mask,u32 or) {u32 val =gmu_read (gmu, reg);
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 4/6 drm/msm/gpu: Move gpu_poll_timeout() to adreno_gpu.h
In reply to a message not in the archiveThe gpu_poll_timeout() function can be useful to multiple targets so mvoe it into adreno_gpu.h from the a5xx code.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 ----- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +0 -5
@@ -20,7 +20,6 @@#include <linux/soc/qcom/mdt_loader.h> #include <linux/pm_opp.h> #include <linux/nvmem-consumer.h> -#include <linux/iopoll.h> #include <linux/slab.h> #include "msm_gem.h" #include "msm_mmu.h"
@@ -1211,10 +1210,6 @@ struct a5xx_gpu_state {u32 *hlsqregs; }; -#define gpu_poll_timeout (gpu, addr, val, cond, interval, timeout) \ - readl_poll_timeout((gpu)->mmio + ((addr) << 2), val, cond, \ - interval, timeout) -static int a5xx_crashdumper_init (struct msm_gpu *gpu,struct a5xx_crashdumper *dumper) {
drivers/gpu/drm/msm/adreno/adreno_gpu.h +6 -0
@@ -21,6 +21,7 @@#define __ADRENO_GPU_H__#include <linux/firmware.h> +#include <linux/iopoll.h> #include "msm_gpu.h"
@@ -375,4 +376,9 @@ static inline uint32_t get_wptr(struct msm_ringbuffer *ring) ((1 <<29 ) \ ((ilog2((_len)) & 0x1F) << 24) | (((_reg) << 2) & 0xFFFFF)) + +#define gpu_poll_timeout (gpu, addr, val, cond, interval, timeout) \ + readl_poll_timeout((gpu)->mmio + ((addr) << 2), val, cond, \ + interval, timeout) +#endif /* __ADRENO_GPU_H__ */
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 5/6 drm/msm/adreno: Don't capture registers if target doesn't need them
In reply to a message not in the archiveIf the GPU target doesn't define a list of registers then gracefully skip capturing and/or printing them. This is used by more complex targets like 6xx that have other means of capturing register values.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +14 -5
@@ -414,6 +414,10 @@ int adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state) } } +/* Some targets prefer to collect their own registers */ +if (!adreno_gpu->registers) +return 0 ; +/* Count the number of registers */ for (i =0 ; adreno_gpu->registers[i] != ~0 ; i +=2 ) count += adreno_gpu->registers[i + 1] -
@@ -551,12 +555,14 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, } } -drm_puts (p,"registers:\n" ); +if (state->nr_registers) { +drm_puts (p,"registers:\n" ); -for (i =0 ; i < state->nr_registers; i++) { -drm_printf (p," - { offset: 0x%04x, value: 0x%08x }\n" , - state->registers[i *2 ] <<2 , - state->registers[(i *2 ) +1 ]); +for (i =0 ; i < state->nr_registers; i++) { +drm_printf (p," - { offset: 0x%04x, value: 0x%08x }\n" , + state->registers[i *2 ] <<2 , + state->registers[(i *2 ) +1 ]); + } } }#endif
@@ -595,6 +601,9 @@ void adreno_dump(struct msm_gpu *gpu)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);int i; +if (!adreno_gpu->registers) +return ; +/* dump these out in a form that can be parsed by demsm: */ printk ("IO:region %s 00000000 00020000\n" , gpu->name);for (i =0 ; adreno_gpu->registers[i] != ~0 ; i +=2 ) {
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 6/6 drm/msm/a6xx: Add a6xx gpu state
In reply to a message not in the archiveAdd support for gathering and dumping the a6xx GPU state including registers, GMU registers, indexed registers, shader blocks, context clusters and debugbus.
--- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 39 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 6 + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 1159 +++++++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 430 +++++++ 7 files changed, 1625 insertions(+), 38 deletions(-) create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
drivers/gpu/drm/msm/Makefile +1 -0
@@ -14,6 +14,7 @@ msm-y := \ adreno/a6xx_gpu.o \ adreno/a6xx_gmu.o \ adreno/a6xx_hfi.o \ + adreno/a6xx_gpu_state.o \ hdmi/hdmi.o \ hdmi/hdmi_audio.o \ hdmi/hdmi_bridge.o \
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +23 -2
@@ -55,10 +55,31 @@ static irqreturn_t a6xx_hfi_irq(int irq, void *data)return IRQ_HANDLED ; } +bool a6xx_gmu_sptprac_is_on (struct a6xx_gmu *gmu) +{ +u32 val; + +/* This can be called from gpu state code so make sure GMU is valid */ +if (IS_ERR_OR_NULL (gmu->mmio)) +return false; + + val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS ); + +return !(val & + (A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SPTPRAC_GDSC_POWER_OFF | +A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_SP_CLOCK_OFF )); +} +/* Check to see if the GX rail is still powered */ -static bool a6xx_gmu_gx_is_on (struct a6xx_gmu *gmu) +bool a6xx_gmu_gx_is_on (struct a6xx_gmu *gmu) { -u32 val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS ); +u32 val; + +/* This can be called from gpu state code so make sure GMU is valid */ +if (IS_ERR_OR_NULL (gmu->mmio)) +return false; + + val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS ); return !(val & (A6XX_GMU_SPTPRAC_PWR_CLK_STATUS_GX_HM_GDSC_POWER_OFF |
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +3 -0
@@ -153,4 +153,7 @@ void a6xx_hfi_stop(struct a6xx_gmu *gmu);void a6xx_hfi_task (unsigned long data); +bool a6xx_gmu_gx_is_on (struct a6xx_gmu *gmu); +bool a6xx_gmu_sptprac_is_on (struct a6xx_gmu *gmu); +#endif
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +3 -36
@@ -645,33 +645,6 @@ static const u32 a6xx_register_offsets[REG_ADRENO_REGISTER_MAX] = { REG_ADRENO_DEFINE(REG_ADRENO_CP_RB_CNTL, REG_A6XX_CP_RB_CNTL), }; -static const u32 a6xx_registers[] = { -0x0000 ,0x0002 ,0x0010 ,0x0010 ,0x0012 ,0x0012 ,0x0018 ,0x001b , -0x001e ,0x0032 ,0x0038 ,0x003c ,0x0042 ,0x0042 ,0x0044 ,0x0044 , -0x0047 ,0x0047 ,0x0056 ,0x0056 ,0x00ad ,0x00ae ,0x00b0 ,0x00fb , -0x0100 ,0x011d ,0x0200 ,0x020d ,0x0210 ,0x0213 ,0x0218 ,0x023d , -0x0400 ,0x04f9 ,0x0500 ,0x0500 ,0x0505 ,0x050b ,0x050e ,0x0511 , -0x0533 ,0x0533 ,0x0540 ,0x0555 ,0x0800 ,0x0808 ,0x0810 ,0x0813 , -0x0820 ,0x0821 ,0x0823 ,0x0827 ,0x0830 ,0x0833 ,0x0840 ,0x0843 , -0x084f ,0x086f ,0x0880 ,0x088a ,0x08a0 ,0x08ab ,0x08c0 ,0x08c4 , -0x08d0 ,0x08dd ,0x08f0 ,0x08f3 ,0x0900 ,0x0903 ,0x0908 ,0x0911 , -0x0928 ,0x093e ,0x0942 ,0x094d ,0x0980 ,0x0984 ,0x098d ,0x0996 , -0x0998 ,0x099e ,0x09a0 ,0x09a6 ,0x09a8 ,0x09ae ,0x09b0 ,0x09b1 , -0x09c2 ,0x09c8 ,0x0a00 ,0x0a03 ,0x0c00 ,0x0c04 ,0x0c06 ,0x0c06 , -0x0c10 ,0x0cd9 ,0x0e00 ,0x0e0e ,0x0e10 ,0x0e13 ,0x0e17 ,0x0e19 , -0x0e1c ,0x0e2b ,0x0e30 ,0x0e32 ,0x0e38 ,0x0e39 ,0x8600 ,0x8601 , -0x8610 ,0x861b ,0x8620 ,0x8620 ,0x8628 ,0x862b ,0x8630 ,0x8637 , -0x8e01 ,0x8e01 ,0x8e04 ,0x8e05 ,0x8e07 ,0x8e08 ,0x8e0c ,0x8e0c , -0x8e10 ,0x8e1c ,0x8e20 ,0x8e25 ,0x8e28 ,0x8e28 ,0x8e2c ,0x8e2f , -0x8e3b ,0x8e3e ,0x8e40 ,0x8e43 ,0x8e50 ,0x8e5e ,0x8e70 ,0x8e77 , -0x9600 ,0x9604 ,0x9624 ,0x9637 ,0x9e00 ,0x9e01 ,0x9e03 ,0x9e0e , -0x9e11 ,0x9e16 ,0x9e19 ,0x9e19 ,0x9e1c ,0x9e1c ,0x9e20 ,0x9e23 , -0x9e30 ,0x9e31 ,0x9e34 ,0x9e34 ,0x9e70 ,0x9e72 ,0x9e78 ,0x9e79 , -0x9e80 ,0x9fff ,0xa600 ,0xa601 ,0xa603 ,0xa603 ,0xa60a ,0xa60a , -0xa610 ,0xa617 ,0xa630 ,0xa630 , - ~0 -}; -static int a6xx_pm_resume (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -720,14 +693,6 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)return 0 ; } -#if defined(CONFIG_DEBUG_FS ) || defined(CONFIG_DEV_COREDUMP ) -static void a6xx_show (struct msm_gpu *gpu,struct msm_gpu_state *state, -struct drm_printer *p) -{ -adreno_show (gpu, state, p); -} -#endif -static struct msm_ringbuffer *a6xx_active_ring (struct msm_gpu *gpu) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -768,6 +733,8 @@ static const struct adreno_gpu_funcs funcs = {#if defined(CONFIG_DEBUG_FS ) || defined(CONFIG_DEV_COREDUMP ) .show = a6xx_show, #endif + .gpu_state_get = a6xx_gpu_state_get, + .gpu_state_put = a6xx_gpu_state_put, }, .get_timestamp = a6xx_get_timestamp, };
@@ -789,7 +756,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu = &a6xx_gpu->base; gpu = &adreno_gpu->base; - adreno_gpu->registers = a6xx_registers; + adreno_gpu->registers =NULL ; adreno_gpu->reg_offsets = a6xx_register_offsets; ret =adreno_gpu_init (dev, pdev, adreno_gpu, &funcs,1 );
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +6 -0
@@ -57,4 +57,10 @@ void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state);int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node);void a6xx_gmu_remove (struct a6xx_gpu *a6xx_gpu); +void a6xx_show (struct msm_gpu *gpu,struct msm_gpu_state *state, +struct drm_printer *p); + +struct msm_gpu_state *a6xx_gpu_state_get (struct msm_gpu *gpu); +int a6xx_gpu_state_put (struct msm_gpu_state *state); +#endif /* __A6XX_GPU_H__ */
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c new file +1159 -0
1,159 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h new file +430 -0
430 lines not on this page · raw message
Signature · 6 lines
2.18.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH 3/6 drm/msm/a6xx: Rename gmu phandle to qcom,gmu
In reply to Jordan CrouseFrom the review for the DT bindings for the GPU/GMU it was suggested that the phandle for the GMU be 'qcom,gmu' instead of just 'gmu' but that never actually got changed in the code.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -799,7 +799,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) }/* Check if there is a GMU phandle and set it up */ - node =of_parse_phandle (pdev->dev.of_node,"gmu" ,0 ); + node =of_parse_phandle (pdev->dev.of_node,"qcom,gmu" ,0 );/* FIXME: How do we gracefully handle this? */ BUG_ON (!node);
Signature · 6 lines
2.18.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel