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

Commit 897900e0 authored by Kyle Piefer's avatar Kyle Piefer Committed by Gerrit - the friendly Code Review server
Browse files

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



The GMU firmware team does not currently use the counters that are
reserved for them, so they are allowing them to be reclaimed
by KGSL for the purpose of monitoring the throttled clock cycles.

This reverts commit 9d57d42d.

Change-Id: I15e75f77188e91ecdbcf1ea1e2458d1f65122dfb
Signed-off-by: default avatarKyle Piefer <kpiefer@codeaurora.org>
parent bdd63def

drivers/gpu/msm/adreno_a6xx.c

+2 −8
Original line number Original line 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_L,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_3_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_3_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_0, },

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_0, },

	/*

	{ KGSL_PERFCOUNTER_NOT_USED, 0, 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,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_4_L,

		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_XOCLK_4_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_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_L,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_XOCLK_5_H, -1,

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_1, },

		A6XX_GMU_CX_GMU_POWER_COUNTER_SELECT_1, },