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

Commit f4bdc191 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 microcode save/restore of perf counter values on A6x"

parents 8189b824 20b1df9f

drivers/gpu/msm/adreno_a6xx.c

+13 −1
Original line number Diff line number Diff line
@@ -562,11 +562,20 @@ static int a6xx_microcode_load(struct adreno_device *adreno_dev) 
/* Ucode workaround masks */

#define CP_INIT_UCODE_WORKAROUND_MASK BIT(5)



/*

 * Operation mode mask

 *

 * This ordinal provides the option to disable the

 * save/restore of performance counters across preemption.

 */

#define CP_INIT_OPERATION_MODE_MASK BIT(6)



#define CP_INIT_MASK (CP_INIT_MAX_CONTEXT | \

		CP_INIT_ERROR_DETECTION_CONTROL | \

		CP_INIT_HEADER_DUMP | \

		CP_INIT_DEFAULT_RESET_STATE | \

		CP_INIT_UCODE_WORKAROUND_MASK)

		CP_INIT_UCODE_WORKAROUND_MASK | \

		CP_INIT_OPERATION_MODE_MASK)



static void _set_ordinals(struct adreno_device *adreno_dev,

		unsigned int *cmds, unsigned int count)
@@ -599,6 +608,9 @@ static void _set_ordinals(struct adreno_device *adreno_dev, 
	if (CP_INIT_MASK & CP_INIT_UCODE_WORKAROUND_MASK)

		*cmds++ = 0x00000000;



	if (CP_INIT_MASK & CP_INIT_OPERATION_MODE_MASK)

		*cmds++ = 0x00000002;



	/* Pad rest of the cmds with 0's */

	while ((unsigned int)(cmds - start) < count)

		*cmds++ = 0x0;