drm/msm/a6xx: hwcg tables in gpulist
Subsystems (4)
PATCH v2 1/2 drm/msm/a6xx: hwcg tables in gpulist
This will allow supporting different hwcg tables for a6xx.
Signed-off-by Jonathan Marek <[email protected]>
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 25 ++++++++++------------ drivers/gpu/drm/msm/adreno/adreno_device.c | 1 + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 8 +++++++ 3 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +11 -14
@@ -151,10 +151,7 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit,a6xx_flush (gpu, ring); } -static const struct { -u32 offset; -u32 value; -} a6xx_hwcg[] = { +const struct adreno_reglist a630_hwcg[] = { {REG_A6XX_RBBM_CLOCK_CNTL_SP0 ,0x22222222 }, {REG_A6XX_RBBM_CLOCK_CNTL_SP1 ,0x22222222 }, {REG_A6XX_RBBM_CLOCK_CNTL_SP2 ,0x22222222 },
@@ -259,7 +256,8 @@ static const struct { {REG_A6XX_RBBM_CLOCK_MODE_HLSQ, 0x00002222}, {REG_A6XX_RBBM_CLOCK_CNTL_GMU_GX, 0x00000222}, {REG_A6XX_RBBM_CLOCK_DELAY_GMU_GX, 0x00000111}, - {REG_A6XX_RBBM_CLOCK_HYST_GMU_GX, 0x00000555} + {REG_A6XX_RBBM_CLOCK_HYST_GMU_GX, 0x00000555}, + {}, };static void a6xx_set_hwcg (struct msm_gpu *gpu,bool state)
@@ -267,9 +265,13 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);struct a6xx_gmu *gmu = &a6xx_gpu->gmu; +const struct adreno_reglist *reg;unsigned int i;u32 val; +if (!adreno_gpu->info->hwcg) +return ; + val =gpu_read (gpu,REG_A6XX_RBBM_CLOCK_CNTL );/* Don't re-program the registers if they are already correct */
@@ -279,9 +281,8 @@ static void a6xx_set_hwcg(struct msm_gpu *gpu, bool state)/* Disable SP clock before programming HWCG registers */ gmu_rmw (gmu,REG_A6XX_GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL ,1 ,0 ); -for (i =0 ; i <ARRAY_SIZE (a6xx_hwcg); i++) -gpu_write (gpu, a6xx_hwcg[i].offset, - state ? a6xx_hwcg[i].value :0 ); +for (i =0 ; (reg = &adreno_gpu->info->hwcg[i], reg->offset); i++) +gpu_write (gpu, reg->offset, state ? reg->value :0 );/* Enable SP clock */ gmu_rmw (gmu,REG_A6XX_GPU_GMU_GX_SPTPRAC_CLOCK_CONTROL ,0 ,1 );
@@ -437,12 +438,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu)gpu_write (gpu,REG_A6XX_TPL1_ADDR_MODE_CNTL ,0x1 );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TSB_ADDR_MODE_CNTL ,0x1 ); -/* -* enable hardware clockgating -* For now enable clock gating only for a630 -*/ -if (adreno_is_a630 (adreno_gpu)) -a6xx_set_hwcg (gpu, true); +/* enable hardware clockgating */ +a6xx_set_hwcg (gpu, true);/* VBIF/GBIF start*/ if (adreno_is_a640 (adreno_gpu) ||adreno_is_a650 (adreno_gpu)) {
drivers/gpu/drm/msm/adreno/adreno_device.c +1 -0
@@ -200,6 +200,7 @@ static const struct adreno_info gpulist[] = { .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a6xx_gpu_init, .zapfw = "a630_zap.mdt", + .hwcg = a630_hwcg, }, { .rev = ADRENO_REV(6, 4, 0, ANY_ID), .revn = 640,
drivers/gpu/drm/msm/adreno/adreno_gpu.h +8 -0
@@ -68,6 +68,13 @@ struct adreno_gpu_funcs {int (*get_timestamp)(struct msm_gpu *gpu,uint64_t *value); }; +struct adreno_reglist { +u32 offset; +u32 value; +}; + +extern const struct adreno_reglist a630_hwcg[]; +struct adreno_info {struct adreno_rev rev;uint32_t revn;
@@ -78,6 +85,7 @@ struct adreno_info {struct msm_gpu *(*init)(struct drm_device *dev);const char *zapfw;u32 inactive_period; +const struct adreno_reglist *hwcg; };const struct adreno_info *adreno_info (struct adreno_rev rev);
Signature · 1 line
2.26.1
PATCH v2 2/2 drm/msm/a6xx: add A640/A650 hwcg
Initialize hardware clock-gating registers on A640 and A650 GPUs.
At least for A650, this solves some performance issues.
Signed-off-by Jonathan Marek <[email protected]>
--- drivers/gpu/drm/msm/adreno/a6xx.xml.h | 8 ++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 117 ++++++++++++++++++++- drivers/gpu/drm/msm/adreno/adreno_device.c | 2 + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- 4 files changed, 125 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx.xml.h +8 -0
@@ -1996,6 +1996,14 @@ static inline uint32_t A6XX_CP_PROTECT_REG_MASK_LEN(uint32_t val)#define REG_A6XX_RBBM_CLOCK_DELAY_HLSQ 0x0000011c +#define REG_A6XX_RBBM_CLOCK_HYST_HLSQ 0x0000011d + +#define REG_A6XX_RBBM_CLOCK_CNTL_TEX_FCHE 0x00000120 + +#define REG_A6XX_RBBM_CLOCK_DELAY_TEX_FCHE 0x00000121 + +#define REG_A6XX_RBBM_CLOCK_HYST_TEX_FCHE 0x00000122 +#define REG_A6XX_DBGC_CFG_DBGBUS_SEL_A 0x00000600#define REG_A6XX_DBGC_CFG_DBGBUS_SEL_B 0x00000601
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +114 -3
142 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_device.c +2 -0
@@ -213,6 +213,7 @@ static const struct adreno_info gpulist[] = { .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a6xx_gpu_init, .zapfw = "a640_zap.mdt", + .hwcg = a640_hwcg, }, { .rev = ADRENO_REV(6, 5, 0, ANY_ID), .revn = 650,
@@ -225,6 +226,7 @@ static const struct adreno_info gpulist[] = { .inactive_period = DRM_MSM_INACTIVE_PERIOD, .init = a6xx_gpu_init, .zapfw = "a650_zap.mdt", + .hwcg = a650_hwcg, }, };
drivers/gpu/drm/msm/adreno/adreno_gpu.h +1 -1
@@ -73,7 +73,7 @@ struct adreno_reglist {u32 value; }; -extern const struct adreno_reglist a630_hwcg[]; +extern const struct adreno_reglist a630_hwcg[], a640_hwcg[], a650_hwcg[];struct adreno_info {struct adreno_rev rev;
Signature · 1 line
2.26.1