diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-24 02:00:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-24 02:00:55 -0700 |
| commit | c8436074613a4bd8a8b4ffb25eecb9f80d8241ee (patch) | |
| tree | 5855ed71a37e7b668db05c63fe5c3725d7f592e2 | |
| parent | c480cfd424db4a62fdc5ab2ab94a149422633243 (diff) | |
| parent | da71b33976eade0dc55b231e318b5361bd65b7f1 (diff) | |
Merge "msm: kgsl: Disable rbbm countable on a540"
| -rw-r--r-- | drivers/gpu/msm/a5xx_reg.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_perfcounter.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/msm/a5xx_reg.h b/drivers/gpu/msm/a5xx_reg.h index cedd02987002..3b29452ce8bd 100644 --- a/drivers/gpu/msm/a5xx_reg.h +++ b/drivers/gpu/msm/a5xx_reg.h @@ -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 diff --git a/drivers/gpu/msm/adreno_perfcounter.c b/drivers/gpu/msm/adreno_perfcounter.c index 10f4577c1103..8e354d71a291 100644 --- a/drivers/gpu/msm/adreno_perfcounter.c +++ b/drivers/gpu/msm/adreno_perfcounter.c @@ -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); |