Merge "msm: kgsl: Don't enable VBIF counters for targets that don't use them" (bfbfc0fe) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno_a3xx.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -1947,6 +1947,7 @@ void a3xx_perfcounter_close(struct adreno_device *adreno_dev)
		int a3xx_perfcounter_init(struct adreno_device *adreno_dev)
		{
		int ret;
		struct kgsl_device *device = &adreno_dev->dev;
		/* SP[3] counter is broken on a330 so disable it if a330 device */
		if (adreno_is_a330(adreno_dev))
		a3xx_perfcounters_sp[3].countable = KGSL_PERFCOUNTER_BROKEN;
		@@ -1959,16 +1960,19 @@ int a3xx_perfcounter_init(struct adreno_device *adreno_dev)
		ret = adreno_perfcounter_get(adreno_dev, KGSL_PERFCOUNTER_GROUP_PWR, 1,
		NULL, NULL, PERFCOUNTER_FLAG_KERNEL);

		if (device->pwrctrl.bus_control) {
		/* VBIF waiting for RAM */
		ret \|= adreno_perfcounter_get(adreno_dev,
		KGSL_PERFCOUNTER_GROUP_VBIF_PWR, 0,
		NULL, NULL, PERFCOUNTER_FLAG_KERNEL);

		/* VBIF DDR cycles */
		ret \|= adreno_perfcounter_get(adreno_dev, KGSL_PERFCOUNTER_GROUP_VBIF,
		ret \|= adreno_perfcounter_get(adreno_dev,
		KGSL_PERFCOUNTER_GROUP_VBIF,
		VBIF_AXI_TOTAL_BEATS,
		&adreno_dev->ram_cycles_lo, NULL,
		PERFCOUNTER_FLAG_KERNEL);
		}

		/* Default performance counter profiling to false */
		adreno_dev->profile.enabled = false;