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

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

Merge "msm: kgsl: Use CACHE_FLUSH_TS for global timestamp"

parents 483b119e 9e8ea5e7

drivers/gpu/msm/adreno_ringbuffer.c

+7 −5
Original line number Diff line number Diff line
@@ -500,8 +500,8 @@ adreno_ringbuffer_addcmds(struct adreno_ringbuffer *rb, 
	total_sizedwords += 5; /* eop timestamp */



	if (drawctxt && !is_internal_cmds(flags)) {

		/* global timestamp without cache flush for non-zero context */

		total_sizedwords += 4;

		/* global timestamp with cache flush ts for non-zero context */

		total_sizedwords += 5;

	}



	if (flags & KGSL_CMD_FLAGS_WFI)
@@ -652,9 +652,11 @@ adreno_ringbuffer_addcmds(struct adreno_ringbuffer *rb, 
		*ringcmds++ = timestamp;



		/* Write the end of pipeline timestamp to the ringbuffer too */

		ringcmds += cp_mem_write(adreno_dev, ringcmds,

			MEMSTORE_RB_GPU_ADDR(device, rb, eoptimestamp),

			rb->timestamp);

		*ringcmds++ = cp_mem_packet(adreno_dev, CP_EVENT_WRITE, 3, 1);

		*ringcmds++ = CACHE_FLUSH_TS;

		ringcmds += cp_gpuaddr(adreno_dev, ringcmds,

			MEMSTORE_RB_GPU_ADDR(device, rb, eoptimestamp));

		*ringcmds++ = rb->timestamp;

	} else {

		ringcmds += cp_gpuaddr(adreno_dev, ringcmds,

			MEMSTORE_RB_GPU_ADDR(device, rb, eoptimestamp));