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

Commit 3d60989c 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: Add performance counter init function for A4XX"

parents 7f2748b4 bb54906c

drivers/gpu/msm/adreno_a3xx.c

+2 −2
Original line number Diff line number Diff line
@@ -4223,7 +4223,7 @@ static struct adreno_perfcounters a3xx_perfcounters = { 
 * a3xx_perfcounter_init

 * @adreno_dev: The device for which counters were initialized

 */

static void a3xx_perfcounter_close(struct adreno_device *adreno_dev)

void a3xx_perfcounter_close(struct adreno_device *adreno_dev)

{

	adreno_perfcounter_put(adreno_dev, KGSL_PERFCOUNTER_GROUP_SP,

		SP_FS_FULL_ALU_INSTRUCTIONS,
@@ -4239,7 +4239,7 @@ static void a3xx_perfcounter_close(struct adreno_device *adreno_dev) 
		PERFCOUNTER_FLAG_KERNEL);

}



static int a3xx_perfcounter_init(struct adreno_device *adreno_dev)

int a3xx_perfcounter_init(struct adreno_device *adreno_dev)

{

	int ret;

	/* SP[3] counter is broken on a330 so disable it if a330 device */

drivers/gpu/msm/adreno_a3xx.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ unsigned int a3xx_busy_cycles(struct adreno_device *adreno_dev); 


int a3xx_rb_init(struct adreno_device *adreno_dev,

			struct adreno_ringbuffer *rb);

int a3xx_perfcounter_init(struct adreno_device *adreno_dev);

void a3xx_perfcounter_close(struct adreno_device *adreno_dev);

int a3xx_perfcounter_enable(struct adreno_device *adreno_dev,

	unsigned int group, unsigned int counter, unsigned int countable);

uint64_t a3xx_perfcounter_read(struct adreno_device *adreno_dev,

drivers/gpu/msm/adreno_a4xx.c

+2 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,8 @@ struct adreno_gpudev adreno_a4xx_gpudev = { 
	.perfcounters = &a4xx_perfcounters,

	.irq = &a4xx_irq,



	.perfcounter_init = a3xx_perfcounter_init,

	.perfcounter_close = a3xx_perfcounter_close,

	.rb_init = a3xx_rb_init,

	.irq_control = a3xx_irq_control,

	.irq_handler = a3xx_irq_handler,