[PATCH] media: cedrus: Add support for additional output formats

[Jernej Skrabec]

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>
---
 drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 18 +++++++++++++++++-
 .../staging/media/sunxi/cedrus/cedrus_video.c  | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c 
b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index daf5f244f93b..c119fd8c4b92 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -83,9 +83,25 @@ 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:
+                       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 15cf1f10221b..016021d71df2 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -55,6 +55,21 @@ static struct cedrus_format cedrus_formats[] = {
                .directions     = CEDRUS_DECODE_DST,
                .capabilities   = CEDRUS_CAPABILITY_UNTILED,
        },
+       {
+               .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)
@@ -130,6 +145,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);
 
-- 
2.26.2

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel