From 3a9f35a7872a0ea2671ec1f6673cb188065cdaaf Mon Sep 17 00:00:00 2001 From: Harshdeep Dhatt Date: Mon, 30 Mar 2020 14:32:04 -0600 Subject: [PATCH] msm: kgsl: Remove duplicated register write This register is already being programmed in a6xx_start. Also, remove duplicated register macros. Change-Id: I3f59e23446b376e39df6abd5eee817317bfb2d67 Signed-off-by: Harshdeep Dhatt --- drivers/gpu/msm/a6xx_reg.h | 2 -- drivers/gpu/msm/adreno_a6xx_gmu.c | 3 --- drivers/gpu/msm/adreno_a6xx_rgmu.c | 6 ------ 3 files changed, 11 deletions(-) diff --git a/drivers/gpu/msm/a6xx_reg.h b/drivers/gpu/msm/a6xx_reg.h index 47b5faaa316f..a2b83f15809f 100644 --- a/drivers/gpu/msm/a6xx_reg.h +++ b/drivers/gpu/msm/a6xx_reg.h @@ -971,8 +971,6 @@ #define A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H 0x1F84D #define A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L 0x1F84E #define A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H 0x1F84F -#define A6XX_GMU_CX_GMU_ALWAYS_ON_COUNTER_L 0x1F888 -#define A6XX_GMU_CX_GMU_ALWAYS_ON_COUNTER_H 0x1F889 #define A6XX_GMU_PWR_COL_INTER_FRAME_CTRL 0x1F8C0 #define A6XX_GMU_PWR_COL_INTER_FRAME_HYST 0x1F8C1 #define A6XX_GMU_PWR_COL_SPTPRAC_HYST 0x1F8C2 diff --git a/drivers/gpu/msm/adreno_a6xx_gmu.c b/drivers/gpu/msm/adreno_a6xx_gmu.c index 15cb9d5e8c3d..f1cbd4931a5c 100644 --- a/drivers/gpu/msm/adreno_a6xx_gmu.c +++ b/drivers/gpu/msm/adreno_a6xx_gmu.c @@ -517,9 +517,6 @@ static int a6xx_rpmh_power_on_gpu(struct kgsl_device *device) /* Clear sleep sequence flag as wakeup sequence is successful */ clear_bit(GMU_RSCC_SLEEP_SEQ_DONE, &device->gmu_core.flags); - /* Enable the power counter because it was disabled before slumber */ - gmu_core_regwrite(device, A6XX_GMU_CX_GMU_POWER_COUNTER_ENABLE, 1); - return 0; error_rsc: dev_err(dev, "GPU RSC sequence stuck in waking up GPU\n"); diff --git a/drivers/gpu/msm/adreno_a6xx_rgmu.c b/drivers/gpu/msm/adreno_a6xx_rgmu.c index 74cd52cbb126..5a3f7c106602 100644 --- a/drivers/gpu/msm/adreno_a6xx_rgmu.c +++ b/drivers/gpu/msm/adreno_a6xx_rgmu.c @@ -367,12 +367,6 @@ static int a6xx_rgmu_fw_start(struct kgsl_device *device, for (i = 0; i < rgmu->fw_size; i++) gmu_core_regwrite(device, A6XX_GMU_CM3_ITCM_START + i, rgmu->fw_hostptr[i]); - /* - * Enable power counter because it was disabled before - * slumber. - */ - gmu_core_regwrite(device, A6XX_GMU_CX_GMU_POWER_COUNTER_ENABLE, - 1); break; }