diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-02-07 08:41:41 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-02-07 08:41:41 -0800 |
| commit | b7c0ad4f6b9695c99640ff566c2affe8f77e4dbb (patch) | |
| tree | 68d2e289881317dfbd8bd030d3595377f829fad0 /drivers/gpu/drm | |
| parent | e0c650273ec0c0f5452d0e94696620840c4a5ebb (diff) | |
| parent | 0a281e5e64c09dea99e3f2068ae223a2beb7d40a (diff) | |
Merge "drm/msm: Corrected CCU load bit configuration"
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a5xx_counters.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_counters.c b/drivers/gpu/drm/msm/adreno/a5xx_counters.c index 1d5e61daca47..a1b88529b986 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_counters.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_counters.c @@ -355,13 +355,13 @@ static struct adreno_counter a5xx_counters_alwayson[1] = { static struct adreno_counter a5xx_counters_ccu[] = { { 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_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_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_RB_PERFCTR_CCU_SEL_3 }, + REG_A5XX_RB_PERFCTR_CCU_SEL_3, 43 }, }; 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[] = { { 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_RB_POWERCTR_CCU_SEL_1, 41 }, + REG_A5XX_RB_POWERCTR_CCU_SEL_1 }, }; static struct adreno_counter a5xx_counters_power_cp[] = { |