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

Commit dec408fd authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Philipp Zabel
Browse files

gpu: ipu-v3: Add chroma plane offset overrides to ipu_cpmem_set_image() 



Allow the caller of ipu_cpmem_set_image() to override the latters
calculation of the chroma plane offsets, by adding override U/V
plane offsets to 'struct ipu_image'.

Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Tested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 22ec0808

drivers/gpu/ipu-v3/ipu-cpmem.c

+27 −19
Original line number Diff line number Diff line
@@ -745,9 +745,11 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image) 
	switch (pix->pixelformat) {

	case V4L2_PIX_FMT_YUV420:

		offset = Y_OFFSET(pix, image->rect.left, image->rect.top);

		u_offset = U_OFFSET(pix, image->rect.left,

		u_offset = image->u_offset ?

			image->u_offset : U_OFFSET(pix, image->rect.left,

						   image->rect.top) - offset;

		v_offset = V_OFFSET(pix, image->rect.left,

		v_offset = image->v_offset ?

			image->v_offset : V_OFFSET(pix, image->rect.left,

						   image->rect.top) - offset;



		ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,
@@ -755,19 +757,23 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image) 
		break;

	case V4L2_PIX_FMT_YVU420:

		offset = Y_OFFSET(pix, image->rect.left, image->rect.top);

		u_offset = U_OFFSET(pix, image->rect.left,

		u_offset = image->u_offset ?

			image->u_offset : V_OFFSET(pix, image->rect.left,

						   image->rect.top) - offset;

		v_offset = V_OFFSET(pix, image->rect.left,

		v_offset = image->v_offset ?

			image->v_offset : U_OFFSET(pix, image->rect.left,

						   image->rect.top) - offset;



		ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,

					      v_offset, u_offset);

					      u_offset, v_offset);

		break;

	case V4L2_PIX_FMT_YUV422P:

		offset = Y_OFFSET(pix, image->rect.left, image->rect.top);

		u_offset = U2_OFFSET(pix, image->rect.left,

		u_offset = image->u_offset ?

			image->u_offset : U2_OFFSET(pix, image->rect.left,

						    image->rect.top) - offset;

		v_offset = V2_OFFSET(pix, image->rect.left,

		v_offset = image->v_offset ?

			image->v_offset : V2_OFFSET(pix, image->rect.left,

						    image->rect.top) - offset;



		ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline / 2,
@@ -775,18 +781,20 @@ int ipu_cpmem_set_image(struct ipuv3_channel *ch, struct ipu_image *image) 
		break;

	case V4L2_PIX_FMT_NV12:

		offset = Y_OFFSET(pix, image->rect.left, image->rect.top);

		u_offset = UV_OFFSET(pix, image->rect.left,

		u_offset = image->u_offset ?

			image->u_offset : UV_OFFSET(pix, image->rect.left,

						    image->rect.top) - offset;

		v_offset = 0;

		v_offset = image->v_offset ? image->v_offset : 0;



		ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline,

					      u_offset, v_offset);

		break;

	case V4L2_PIX_FMT_NV16:

		offset = Y_OFFSET(pix, image->rect.left, image->rect.top);

		u_offset = UV2_OFFSET(pix, image->rect.left,

		u_offset = image->u_offset ?

			image->u_offset : UV2_OFFSET(pix, image->rect.left,

						     image->rect.top) - offset;

		v_offset = 0;

		v_offset = image->v_offset ? image->v_offset : 0;



		ipu_cpmem_set_yuv_planar_full(ch, pix->bytesperline,

					      u_offset, v_offset);

drivers/gpu/ipu-v3/ipu-image-convert.c

+5 −5
Original line number Diff line number Diff line
@@ -655,12 +655,12 @@ static void init_idmac_channel(struct ipu_image_convert_ctx *ctx, 
	tile_image.pix.pixelformat =  image->fmt->fourcc;

	tile_image.phys0 = addr0;

	tile_image.phys1 = addr1;

	ipu_cpmem_set_image(channel, &tile_image);

	if (image->fmt->planar && !rot_swap_width_height) {

		tile_image.u_offset = image->tile[tile_idx[0]].u_off;

		tile_image.v_offset = image->tile[tile_idx[0]].v_off;

	}



	if (image->fmt->planar && !rot_swap_width_height)

		ipu_cpmem_set_uv_offset(channel,

					image->tile[tile_idx[0]].u_off,

					image->tile[tile_idx[0]].v_off);

	ipu_cpmem_set_image(channel, &tile_image);



	if (rot_mode)

		ipu_cpmem_set_rotation(channel, rot_mode);

include/video/imx-ipu-v3.h

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ struct ipu_image { 
	struct v4l2_rect rect;

	dma_addr_t phys0;

	dma_addr_t phys1;

	/* chroma plane offset overrides */

	u32 u_offset;

	u32 v_offset;

};



void ipu_cpmem_zero(struct ipuv3_channel *ch);