Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8436074 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents c480cfd4 da71b339

drivers/gpu/msm/a5xx_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -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

drivers/gpu/msm/adreno_perfcounter.c

+5 −0
Original line number Diff line number Diff line
@@ -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);