[media.git/next] media: cedrus: Add support for additional output formats

[media-ci]

On Fri May 23 17:43:59 2025 +0200, Jernej Skrabec wrote:
> If VPU supports untiled output, it actually supports several different
> YUV 4:2:0 layouts, namely NV12, NV21, YUV420 and YVU420.
> 
> Add support for all of them.
> 
> Signed-off-by: Jernej Skrabec <jernej.skra...@siol.net>
> Reviewed-by: Paul Kocialkowski <pa...@sys-base.io>
> Signed-off-by: Nicolas Dufresne <nicolas.dufre...@collabora.com>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
> [hverkuil: add 'default' case to switch to fix warning with old compiler]

Patch committed.

Thanks,
Hans Verkuil

 drivers/staging/media/sunxi/cedrus/cedrus_hw.c    | 19 ++++++++++++++++++-
 drivers/staging/media/sunxi/cedrus/cedrus_video.c | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

---

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c 
b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index 32af0e96e762..444fb53878d1 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -86,9 +86,26 @@ void cedrus_dst_format_set(struct cedrus_dev *dev,
 
        switch (fmt->pixelformat) {
        case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_YUV420:
+       case V4L2_PIX_FMT_YVU420:
                chroma_size = ALIGN(width, 16) * ALIGN(height, 16) / 2;
 
-               reg = VE_PRIMARY_OUT_FMT_NV12;
+               switch (fmt->pixelformat) {
+               case V4L2_PIX_FMT_NV12:
+                       reg = VE_PRIMARY_OUT_FMT_NV12;
+                       break;
+               case V4L2_PIX_FMT_NV21:
+                       reg = VE_PRIMARY_OUT_FMT_NV21;
+                       break;
+               case V4L2_PIX_FMT_YUV420:
+                       reg = VE_PRIMARY_OUT_FMT_YU12;
+                       break;
+               case V4L2_PIX_FMT_YVU420:
+               default:
+                       reg = VE_PRIMARY_OUT_FMT_YV12;
+                       break;
+               }
                cedrus_write(dev, VE_PRIMARY_OUT_FMT, reg);
 
                reg = chroma_size / 2;
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c 
b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index 77f78266f406..9fae2c7493d0 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -64,6 +64,21 @@ static struct cedrus_format cedrus_formats[] = {
                .pixelformat    = V4L2_PIX_FMT_NV12_32L32,
                .directions     = CEDRUS_DECODE_DST,
        },
+       {
+               .pixelformat    = V4L2_PIX_FMT_NV21,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
+       {
+               .pixelformat    = V4L2_PIX_FMT_YUV420,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
+       {
+               .pixelformat    = V4L2_PIX_FMT_YVU420,
+               .directions     = CEDRUS_DECODE_DST,
+               .capabilities   = CEDRUS_CAPABILITY_UNTILED,
+       },
 };
 
 #define CEDRUS_FORMATS_COUNT   ARRAY_SIZE(cedrus_formats)
@@ -140,6 +155,9 @@ void cedrus_prepare_format(struct v4l2_pix_format *pix_fmt)
                break;
 
        case V4L2_PIX_FMT_NV12:
+       case V4L2_PIX_FMT_NV21:
+       case V4L2_PIX_FMT_YUV420:
+       case V4L2_PIX_FMT_YVU420:
                /* 16-aligned stride. */
                bytesperline = ALIGN(width, 16);