Merge "msm: kgsl: Correctly enable A3XX performance counters" (d92e6d55) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/gpu/msm/adreno_a3xx.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -3242,7 +3242,6 @@ static int a3xx_perfcounter_enable(struct adreno_device *adreno_dev,
		unsigned int group, unsigned int counter, unsigned int countable)
		{
		struct kgsl_device *device = &adreno_dev->dev;
		unsigned int val = 0;
		struct adreno_perfcount_register *reg;

		/* Special cases */
		@@ -3267,15 +3266,6 @@ static int a3xx_perfcounter_enable(struct adreno_device *adreno_dev,
		/* Select the desired perfcounter */
		kgsl_regwrite(device, reg->select, countable);

		if (reg->load_bit < 32) {
		kgsl_regread(device, A3XX_RBBM_PERFCTR_LOAD_CMD0, &val);
		val \|= (1 << reg->load_bit);
		kgsl_regwrite(device, A3XX_RBBM_PERFCTR_LOAD_CMD0, val);
		} else {
		kgsl_regread(device, A3XX_RBBM_PERFCTR_LOAD_CMD1, &val);
		val \|= (1 << (reg->load_bit - 32));
		kgsl_regwrite(device, A3XX_RBBM_PERFCTR_LOAD_CMD1, val);
		}
		return 0;
		}