[PATCH] media: coda: fix frame_mem_ctrl for YUV420 and YVU420 formats

[PATCH] media: coda: fix frame_mem_ctrl for YUV420 and YVU420 formats

[Philipp Zabel]

The frame memory control register value is currently determined
before userspace selects the final capture format and never corrected.
Update ctx->frame_mem_ctrl in __coda_start_decoding() to fix decoding
into YUV420 or YVU420 capture buffers.

Reported-by: Andrej Picej <andrej.picej@norik.com>
Fixes: 497e6b8559a6 ("media: coda: add sequence initialization work")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/media/platform/coda/coda-bit.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 2f42808c43a4..c484c008ab02 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -2053,17 +2053,25 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
 	u32 src_fourcc, dst_fourcc;
 	int ret;
 
+	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+	src_fourcc = q_data_src->fourcc;
+	dst_fourcc = q_data_dst->fourcc;
+
 	if (!ctx->initialized) {
 		ret = __coda_decoder_seq_init(ctx);
 		if (ret < 0)
 			return ret;
+	} else {
+		ctx->frame_mem_ctrl &= ~(CODA_FRAME_CHROMA_INTERLEAVE | (0x3 << 9) |
+					 CODA9_FRAME_TILED2LINEAR);
+		if (dst_fourcc == V4L2_PIX_FMT_NV12 || dst_fourcc == V4L2_PIX_FMT_YUYV)
+			ctx->frame_mem_ctrl |= CODA_FRAME_CHROMA_INTERLEAVE;
+		if (ctx->tiled_map_type == GDI_TILED_FRAME_MB_RASTER_MAP)
+			ctx->frame_mem_ctrl |= (0x3 << 9) |
+				((ctx->use_vdoa) ? 0 : CODA9_FRAME_TILED2LINEAR);
 	}
 
-	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
-	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
-	src_fourcc = q_data_src->fourcc;
-	dst_fourcc = q_data_dst->fourcc;
-
 	coda_write(dev, ctx->parabuf.paddr, CODA_REG_BIT_PARA_BUF_ADDR);
 
 	ret = coda_alloc_framebuffers(ctx, q_data_dst, src_fourcc);
-- 
2.30.2

Re: [PATCH] media: coda: fix frame_mem_ctrl for YUV420 and YVU420 formats

[Punit Agrawal]

Hi Philipp,

Philipp Zabel <p.zabel@pengutronix.de> writes:

> The frame memory control register value is currently determined
> before userspace selects the final capture format and never corrected.
> Update ctx->frame_mem_ctrl in __coda_start_decoding() to fix decoding
> into YUV420 or YVU420 capture buffers.
>
> Reported-by: Andrej Picej <andrej.picej@norik.com>
> Fixes: 497e6b8559a6 ("media: coda: add sequence initialization work")
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

Thank you for the patch.

The patch fixes a failure (green screen) to display videos when using
I420 and YV12 with gstreamer.

Tested-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>

Considering it's a bug fix, any chance this can be picked up for 5.14?
It'll help land it to stable kernels which are being used on i.MX6 based
platforms internally.

Thanks,
Punit

> ---
>  drivers/media/platform/coda/coda-bit.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
> index 2f42808c43a4..c484c008ab02 100644
> --- a/drivers/media/platform/coda/coda-bit.c
> +++ b/drivers/media/platform/coda/coda-bit.c
> @@ -2053,17 +2053,25 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
>  	u32 src_fourcc, dst_fourcc;
>  	int ret;
>  
> +	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
> +	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
> +	src_fourcc = q_data_src->fourcc;
> +	dst_fourcc = q_data_dst->fourcc;
> +
>  	if (!ctx->initialized) {
>  		ret = __coda_decoder_seq_init(ctx);
>  		if (ret < 0)
>  			return ret;
> +	} else {
> +		ctx->frame_mem_ctrl &= ~(CODA_FRAME_CHROMA_INTERLEAVE | (0x3 << 9) |
> +					 CODA9_FRAME_TILED2LINEAR);
> +		if (dst_fourcc == V4L2_PIX_FMT_NV12 || dst_fourcc == V4L2_PIX_FMT_YUYV)
> +			ctx->frame_mem_ctrl |= CODA_FRAME_CHROMA_INTERLEAVE;
> +		if (ctx->tiled_map_type == GDI_TILED_FRAME_MB_RASTER_MAP)
> +			ctx->frame_mem_ctrl |= (0x3 << 9) |
> +				((ctx->use_vdoa) ? 0 : CODA9_FRAME_TILED2LINEAR);
>  	}
>  
> -	q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
> -	q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
> -	src_fourcc = q_data_src->fourcc;
> -	dst_fourcc = q_data_dst->fourcc;
> -
>  	coda_write(dev, ctx->parabuf.paddr, CODA_REG_BIT_PARA_BUF_ADDR);
>  
>  	ret = coda_alloc_framebuffers(ctx, q_data_dst, src_fourcc);