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

Commit d992f461 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "msm: kgsl: Prevent dual ownership of GMU counters""

parents 3e2990bb 897900e0

drivers/gpu/msm/adreno_a6xx.c

+2 −8
Original line number Diff line number Diff line
@@ -2546,17 +2546,11 @@ static struct adreno_perfcount_register a6xx_pwrcounters_gpmu[] = { 
		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_3_L,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_3_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_0, },

	/*

	 * Both A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4 and

	 * A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5 are owned

	 * by the GMU. Mark them as broken so there is no

	 * dual ownership.

	 */

	{ KGSL_PERFCOUNTER_BROKEN, 0, 0,

	{ KGSL_PERFCOUNTER_NOT_USED, 0, 0,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4_L,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_1, },

	{ KGSL_PERFCOUNTER_BROKEN, 0, 0,

	{ KGSL_PERFCOUNTER_NOT_USED, 0, 0,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_L,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_1, },