From a0badd2caea31e898d5d9000fc41e2f851b503ae Mon Sep 17 00:00:00 2001 From: Raghu Ananya Arabolu Date: Fri, 10 Apr 2020 15:33:33 -0700 Subject: [PATCH] msm: kgsl: Do not modify UCHE_CMDQ_CONFIG register for A660 Commit e9a3b1cd0124 ("msm: kgsl: Setup UCHE_CMDQ_CONFIG register for A660") is incorrectly setting a debug configuration. Remove it. Change-Id: I7628a9bb4d7711e907687a3c8bda766802298d1d Signed-off-by: Raghu Ananya Arabolu --- drivers/gpu/msm/a6xx_reg.h | 1 - drivers/gpu/msm/adreno_a6xx.c | 18 ++++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/msm/a6xx_reg.h b/drivers/gpu/msm/a6xx_reg.h index 67675b5ffaff..6f0276324c74 100644 --- a/drivers/gpu/msm/a6xx_reg.h +++ b/drivers/gpu/msm/a6xx_reg.h @@ -726,7 +726,6 @@ #define A6XX_UCHE_PERFCTR_UCHE_SEL_10 0xE26 #define A6XX_UCHE_PERFCTR_UCHE_SEL_11 0xE27 #define A6XX_UCHE_GBIF_GX_CONFIG 0xE3A -#define A6XX_UCHE_CMDQ_CONFIG 0xE3C /* SP registers */ #define A6XX_SP_ADDR_MODE_CNTL 0xAE01 diff --git a/drivers/gpu/msm/adreno_a6xx.c b/drivers/gpu/msm/adreno_a6xx.c index e6b5b2de34fc..a8ba27427965 100644 --- a/drivers/gpu/msm/adreno_a6xx.c +++ b/drivers/gpu/msm/adreno_a6xx.c @@ -102,16 +102,14 @@ static u32 a6xx_ifpc_pwrup_reglist[] = { A6XX_CP_AHB_CNTL, }; -/* a620 and a650 need to program A6XX_CP_PROTECT_REG_47 for the infinite span */ +/* + * a620, a650 and a660 need to program A6XX_CP_PROTECT_REG_47 + * for the infinite span + */ static u32 a650_pwrup_reglist[] = { A6XX_CP_PROTECT_REG + 47, }; -static u32 a660_pwrup_reglist[] = { - A6XX_CP_PROTECT_REG + 47, - A6XX_UCHE_CMDQ_CONFIG, -}; - static u32 a615_pwrup_reglist[] = { A6XX_UCHE_GBIF_GX_CONFIG, }; @@ -319,10 +317,8 @@ static void a6xx_patch_pwrup_reglist(struct adreno_device *adreno_dev) reglist[items++] = REGLIST(a612_pwrup_reglist); else if (adreno_is_a615_family(adreno_dev)) reglist[items++] = REGLIST(a615_pwrup_reglist); - else if (adreno_is_a650(adreno_dev) || adreno_is_a620(adreno_dev)) + else if (adreno_is_a650_family(adreno_dev)) reglist[items++] = REGLIST(a650_pwrup_reglist); - else if (adreno_is_a660(adreno_dev)) - reglist[items++] = REGLIST(a660_pwrup_reglist); /* * For each entry in each of the lists, write the offset and the current @@ -621,10 +617,8 @@ static void a6xx_start(struct adreno_device *adreno_dev) a6xx_llc_enable_overrides(adreno_dev); - if (adreno_is_a660(adreno_dev)) { + if (adreno_is_a660(adreno_dev)) kgsl_regwrite(device, A6XX_CP_CHICKEN_DBG, 0x1); - kgsl_regwrite(device, A6XX_UCHE_CMDQ_CONFIG, 0x6632f); - } if (adreno_is_a660v1(adreno_dev)) kgsl_regwrite(device, A6XX_RBBM_GBIF_CLIENT_QOS_CNTL, 0x0);