Commit 11cdb81b authored by Jie Zhang's avatar Jie Zhang Committed by Rob Clark
Browse files

drm/msm/a6xx: Fix gpucc register block for A621 



Adreno 621 has a different memory map for GPUCC block. So update
a6xx_gpu_state code to dump the correct set of gpucc registers.

Signed-off-by: default avatarJie Zhang <quic_jiezh@quicinc.com>
Signed-off-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/640055/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 378a6219

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c

+7 −2
Original line number Diff line number Diff line
@@ -1226,6 +1226,11 @@ static void a6xx_get_gmu_registers(struct msm_gpu *gpu, 
		&a6xx_state->gmu_registers[0], false);

	_a6xx_get_gmu_registers(gpu, a6xx_state, &a6xx_gmu_reglist[1],

		&a6xx_state->gmu_registers[1], true);



	if (adreno_is_a621(adreno_gpu))

		_a6xx_get_gmu_registers(gpu, a6xx_state, &a621_gpucc_reg,

			&a6xx_state->gmu_registers[2], false);

	else

		_a6xx_get_gmu_registers(gpu, a6xx_state, &a6xx_gpucc_reg,

			&a6xx_state->gmu_registers[2], false);

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h

+12 −0
Original line number Diff line number Diff line
@@ -376,6 +376,17 @@ static const u32 a6xx_gmu_gpucc_registers[] = { 
	0xbc00, 0xbc16, 0xbc20, 0xbc27,

};



static const u32 a621_gmu_gpucc_registers[] = {

	/* GPU CC */

	0x9800, 0x980e, 0x9c00, 0x9c0e, 0xb000, 0xb004, 0xb400, 0xb404,

	0xb800, 0xb804, 0xbc00, 0xbc05, 0xbc14, 0xbc1d, 0xbc2a, 0xbc30,

	0xbc32, 0xbc32, 0xbc41, 0xbc55, 0xbc66, 0xbc68, 0xbc78, 0xbc7a,

	0xbc89, 0xbc8a, 0xbc9c, 0xbc9e, 0xbca0, 0xbca3, 0xbcb3, 0xbcb5,

	0xbcc5, 0xbcc7, 0xbcd6, 0xbcd8, 0xbce8, 0xbce9, 0xbcf9, 0xbcfc,

	0xbd0b, 0xbd0c, 0xbd1c, 0xbd1e, 0xbd40, 0xbd70, 0xbe00, 0xbe16,

	0xbe20, 0xbe2d,

};



static const u32 a6xx_gmu_cx_rscc_registers[] = {

	/* GPU RSCC */

	0x008c, 0x008c, 0x0101, 0x0102, 0x0340, 0x0342, 0x0344, 0x0347,
@@ -390,6 +401,7 @@ static const struct a6xx_registers a6xx_gmu_reglist[] = { 
};



static const struct a6xx_registers a6xx_gpucc_reg = REGS(a6xx_gmu_gpucc_registers, 0, 0);

static const struct a6xx_registers a621_gpucc_reg = REGS(a621_gmu_gpucc_registers, 0, 0);



static u32 a6xx_get_cp_roq_size(struct msm_gpu *gpu);

static u32 a7xx_get_cp_roq_size(struct msm_gpu *gpu);