Merge "msm: kgsl: Disable rbbm countable on a540"

This commit is contained in:
Linux Build Service Account 2016-09-24 02:00:55 -07:00 committed by Gerrit - the friendly Code Review server
commit c843607461
2 changed files with 8 additions and 0 deletions

View file

@ -788,6 +788,9 @@
/* COUNTABLE FOR TSE PERFCOUNTER */
#define A5XX_TSE_INPUT_PRIM_NUM 0x6
/* COUNTABLE FOR RBBM PERFCOUNTER */
#define A5XX_RBBM_ALWAYS_COUNT 0x0
/* GPMU POWER COUNTERS */
#define A5XX_SP_POWER_COUNTER_0_LO 0xA840
#define A5XX_SP_POWER_COUNTER_0_HI 0xA841

View file

@ -812,6 +812,11 @@ static int adreno_perfcounter_enable(struct adreno_device *adreno_dev,
case KGSL_PERFCOUNTER_GROUP_ALWAYSON_PWR:
_power_counter_enable_alwayson(adreno_dev, counters);
break;
case KGSL_PERFCOUNTER_GROUP_RBBM:
/* The following rbbm countable is not reliable on a540 */
if (adreno_is_a540(adreno_dev))
if (countable == A5XX_RBBM_ALWAYS_COUNT)
return -EINVAL;
default:
return _perfcounter_enable_default(adreno_dev, counters, group,
counter, countable);