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

Commit b1efd310 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 CCU_INVALIDATE packets for A6XX"

parents c6df21c3 6ba7a947

drivers/gpu/msm/adreno.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -895,6 +895,8 @@ struct adreno_gpudev { 
	int (*soft_reset)(struct adreno_device *);

	int (*soft_reset)(struct adreno_device *);

	bool (*gx_is_on)(struct adreno_device *);

	bool (*gx_is_on)(struct adreno_device *);

	bool (*sptprac_is_on)(struct adreno_device *);

	bool (*sptprac_is_on)(struct adreno_device *);

	unsigned int (*ccu_invalidate)(struct adreno_device *adreno_dev,

				unsigned int *cmds);

};

};





/**

/**

drivers/gpu/msm/adreno_a6xx.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -2927,6 +2927,20 @@ static void a6xx_platform_setup(struct adreno_device *adreno_dev) 
}

}









static unsigned int a6xx_ccu_invalidate(struct adreno_device *adreno_dev,

	unsigned int *cmds)

{

	/* CCU_INVALIDATE_DEPTH */

	*cmds++ = cp_packet(adreno_dev, CP_EVENT_WRITE, 1);

	*cmds++ = 24;



	/* CCU_INVALIDATE_COLOR */

	*cmds++ = cp_packet(adreno_dev, CP_EVENT_WRITE, 1);

	*cmds++ = 25;



	return 4;

}



/* Register offset defines for A6XX, in order of enum adreno_regs */

/* Register offset defines for A6XX, in order of enum adreno_regs */

static unsigned int a6xx_register_offsets[ADRENO_REG_REGISTER_MAX] = {

static unsigned int a6xx_register_offsets[ADRENO_REG_REGISTER_MAX] = {
@@ -3088,4 +3102,5 @@ struct adreno_gpudev adreno_a6xx_gpudev = { 
	.preemption_context_destroy = a6xx_preemption_context_destroy,

	.preemption_context_destroy = a6xx_preemption_context_destroy,

	.gx_is_on = a6xx_gx_is_on,

	.gx_is_on = a6xx_gx_is_on,

	.sptprac_is_on = a6xx_sptprac_is_on,

	.sptprac_is_on = a6xx_sptprac_is_on,

	.ccu_invalidate = a6xx_ccu_invalidate,

};
 
};

drivers/gpu/msm/adreno_ringbuffer.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -879,6 +879,9 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
	if (gpudev->set_marker)

	if (gpudev->set_marker)

		dwords += 4;

		dwords += 4;





	if (gpudev->ccu_invalidate)

		dwords += 4;



	link = kcalloc(dwords, sizeof(unsigned int), GFP_KERNEL);

	link = kcalloc(dwords, sizeof(unsigned int), GFP_KERNEL);

	if (!link) {

	if (!link) {

		ret = -ENOMEM;

		ret = -ENOMEM;
@@ -932,6 +935,9 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, 
		}

		}

	}

	}





	if (gpudev->ccu_invalidate)

		cmds += gpudev->ccu_invalidate(adreno_dev, cmds);



	if (gpudev->set_marker)

	if (gpudev->set_marker)

		cmds += gpudev->set_marker(cmds, 0);

		cmds += gpudev->set_marker(cmds, 0);