evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm: Corrected CCU load bit configuration"

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-07 08:41:41 -08:00 • committed by Gerrit - the friendly Code Review server
commit b7c0ad4f6b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/msm/adreno/a5xx_counters.c
View file

@ -355,13 +355,13 @@ static struct adreno_counter a5xx_counters_alwayson[1] = {
static struct adreno_counter a5xx_counters_ccu[] = { static struct adreno_counter a5xx_counters_ccu[] = {
{ REG_A5XX_RBBM_PERFCTR_CCU_0_LO, REG_A5XX_RBBM_PERFCTR_CCU_0_HI, { REG_A5XX_RBBM_PERFCTR_CCU_0_LO, REG_A5XX_RBBM_PERFCTR_CCU_0_HI,
REG_A5XX_RB_PERFCTR_CCU_SEL_0 }, REG_A5XX_RB_PERFCTR_CCU_SEL_0, 40 },
{ REG_A5XX_RBBM_PERFCTR_CCU_1_LO, REG_A5XX_RBBM_PERFCTR_CCU_1_HI, { REG_A5XX_RBBM_PERFCTR_CCU_1_LO, REG_A5XX_RBBM_PERFCTR_CCU_1_HI,
REG_A5XX_RB_PERFCTR_CCU_SEL_1 }, REG_A5XX_RB_PERFCTR_CCU_SEL_1, 41 },
{ REG_A5XX_RBBM_PERFCTR_CCU_2_LO, REG_A5XX_RBBM_PERFCTR_CCU_2_HI, { REG_A5XX_RBBM_PERFCTR_CCU_2_LO, REG_A5XX_RBBM_PERFCTR_CCU_2_HI,
REG_A5XX_RB_PERFCTR_CCU_SEL_2 }, REG_A5XX_RB_PERFCTR_CCU_SEL_2, 42 },
{ REG_A5XX_RBBM_PERFCTR_CCU_3_LO, REG_A5XX_RBBM_PERFCTR_CCU_3_HI, { REG_A5XX_RBBM_PERFCTR_CCU_3_LO, REG_A5XX_RBBM_PERFCTR_CCU_3_HI,
REG_A5XX_RB_PERFCTR_CCU_SEL_3 }, REG_A5XX_RB_PERFCTR_CCU_SEL_3, 43 },
}; };
static struct adreno_counter a5xx_counters_cmp[] = { static struct adreno_counter a5xx_counters_cmp[] = {
@ -599,9 +599,9 @@ static struct adreno_counter a5xx_counters_vsc[] = {
static struct adreno_counter a5xx_counters_power_ccu[] = { static struct adreno_counter a5xx_counters_power_ccu[] = {
{ REG_A5XX_CCU_POWER_COUNTER_0_LO, REG_A5XX_CCU_POWER_COUNTER_0_HI, { REG_A5XX_CCU_POWER_COUNTER_0_LO, REG_A5XX_CCU_POWER_COUNTER_0_HI,
REG_A5XX_RB_POWERCTR_CCU_SEL_0, 40 }, REG_A5XX_RB_POWERCTR_CCU_SEL_0 },
{ REG_A5XX_CCU_POWER_COUNTER_1_LO, REG_A5XX_CCU_POWER_COUNTER_1_HI, { REG_A5XX_CCU_POWER_COUNTER_1_LO, REG_A5XX_CCU_POWER_COUNTER_1_HI,
REG_A5XX_RB_POWERCTR_CCU_SEL_1, 41 }, REG_A5XX_RB_POWERCTR_CCU_SEL_1 },
}; };
static struct adreno_counter a5xx_counters_power_cp[] = { static struct adreno_counter a5xx_counters_power_cp[] = {