media: ti-vpe: Add support for NV21 format

In NV21 format, the chroma plane is written to memory such that the U
and V components are swapped for NV12.

Create a new entry in the VPDMA formats to describe the correct data
types used in the data descriptors.

Update all checks for NV12 and add NV21 there as well.

Add support for V4L2_PIX_FMT_NV21 format for both capture and output
streams.

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c
index 53d27cd6e10aee27756a96e0cfe46d0a89fc1a2a..817d287c813807625711aae9c72f476271e0f4f7 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpdma.c
+++ b/drivers/media/platform/ti-vpe/vpdma.c
@@ -56,6 +56,11 @@ const struct vpdma_data_format vpdma_yuv_fmts[] = {
                .data_type      = DATA_TYPE_C420,
                .depth          = 4,
        },
+       [VPDMA_DATA_FMT_CB420] = {
+               .type           = VPDMA_DATA_FMT_TYPE_YUV,
+               .data_type      = DATA_TYPE_CB420,
+               .depth          = 4,
+       },
        [VPDMA_DATA_FMT_YCR422] = {
                .type           = VPDMA_DATA_FMT_TYPE_YUV,
                .data_type      = DATA_TYPE_YCR422,
@@ -825,7 +830,8 @@ void vpdma_rawchan_add_out_dtd(struct vpdma_desc_list *list, int width,
        channel = next_chan = raw_vpdma_chan;
 
        if (fmt->type == VPDMA_DATA_FMT_TYPE_YUV &&
-                       fmt->data_type == DATA_TYPE_C420) {
+           (fmt->data_type == DATA_TYPE_C420 ||
+            fmt->data_type == DATA_TYPE_CB420)) {
                rect.height >>= 1;
                rect.top >>= 1;
                depth = 8;
@@ -893,7 +899,8 @@ void vpdma_add_in_dtd(struct vpdma_desc_list *list, int width,
        channel = next_chan = chan_info[chan].num;
 
        if (fmt->type == VPDMA_DATA_FMT_TYPE_YUV &&
-                       fmt->data_type == DATA_TYPE_C420) {
+           (fmt->data_type == DATA_TYPE_C420 ||
+            fmt->data_type == DATA_TYPE_CB420)) {
                rect.height >>= 1;
                rect.top >>= 1;
                depth = 8;

diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform/ti-vpe/vpdma.h
index 28bc9412934848988b42c8a7c95dc38a08b49e83..bce17329c4c90f6281c79697153239d62a151b5e 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpdma.h
+++ b/drivers/media/platform/ti-vpe/vpdma.h
@@ -71,6 +71,7 @@ enum vpdma_yuv_formats {
        VPDMA_DATA_FMT_C444,
        VPDMA_DATA_FMT_C422,
        VPDMA_DATA_FMT_C420,
+       VPDMA_DATA_FMT_CB420,
        VPDMA_DATA_FMT_YCR422,
        VPDMA_DATA_FMT_YC444,
        VPDMA_DATA_FMT_CRY422,

diff --git a/drivers/media/platform/ti-vpe/vpdma_priv.h b/drivers/media/platform/ti-vpe/vpdma_priv.h
index c488609bc1628c5ec7aa2fe9c67073d17b4f71ed..d8ae3e1cd54d46395fd9d4f356652fd7def7ecfb 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpdma_priv.h
+++ b/drivers/media/platform/ti-vpe/vpdma_priv.h
@@ -92,6 +92,7 @@
 #define DATA_TYPE_C444                         0x4
 #define DATA_TYPE_C422                         0x5
 #define DATA_TYPE_C420                         0x6
+#define DATA_TYPE_CB420                                0x16
 #define DATA_TYPE_YC444                                0x8
 #define DATA_TYPE_YCB422                       0x7
 #define DATA_TYPE_YCR422                       0x17

diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 5d0ec5f7ca259394dd3f8458d1eb82e8672496cf..f3ee9ff87927e3b40813acd74eb222fc1d734884 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -248,6 +248,14 @@ static struct vpe_fmt vpe_formats[] = {
                                    &vpdma_yuv_fmts[VPDMA_DATA_FMT_C420],
                                  },
        },
+       {
+               .fourcc         = V4L2_PIX_FMT_NV21,
+               .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
+               .coplanar       = 1,
+               .vpdma_fmt      = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_Y420],
+                                   &vpdma_yuv_fmts[VPDMA_DATA_FMT_CB420],
+                                 },
+       },
        {
                .fourcc         = V4L2_PIX_FMT_YUYV,
                .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
@@ -686,7 +694,8 @@ static void set_cfg_modes(struct vpe_ctx *ctx)
         * Cfg Mode 1: YUV422 source, disable upsampler, DEI is de-interlacing.
         */
 
-       if (fmt->fourcc == V4L2_PIX_FMT_NV12)
+       if (fmt->fourcc == V4L2_PIX_FMT_NV12 ||
+           fmt->fourcc == V4L2_PIX_FMT_NV21)
                cfg_mode = 0;
 
        write_field(us1_reg0, cfg_mode, VPE_US_MODE_MASK, VPE_US_MODE_SHIFT);
@@ -701,7 +710,8 @@ static void set_line_modes(struct vpe_ctx *ctx)
        struct vpe_fmt *fmt = ctx->q_data[Q_DATA_SRC].fmt;
        int line_mode = 1;
 
-       if (fmt->fourcc == V4L2_PIX_FMT_NV12)
+       if (fmt->fourcc == V4L2_PIX_FMT_NV12 ||
+           fmt->fourcc == V4L2_PIX_FMT_NV21)
                line_mode = 0;          /* double lines to line buffer */
 
        /* regs for now */
@@ -763,7 +773,8 @@ static void set_dst_registers(struct vpe_ctx *ctx)
         */
        val |= VPE_DS_SRC_DEI_SCALER | VPE_CSC_SRC_DEI_SCALER;
 
-       if (fmt->fourcc != V4L2_PIX_FMT_NV12)
+       if (fmt->fourcc != V4L2_PIX_FMT_NV12 &&
+           fmt->fourcc != V4L2_PIX_FMT_NV21)
                val |= VPE_DS_BYPASS;
 
        mmr_adb->out_fmt_reg[0] = val;
@@ -1129,8 +1140,13 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)
 
                        if (field) {
                                int height = q_data->height / 2;
-                               int bpp = fmt->fourcc == V4L2_PIX_FMT_NV12 ?
-                                               1 : (vpdma_fmt->depth >> 3);
+                               int bpp;
+
+                               if (fmt->fourcc == V4L2_PIX_FMT_NV12 ||
+                                   fmt->fourcc == V4L2_PIX_FMT_NV21)
+                                       bpp = 1;
+                               else
+                                       bpp = vpdma_fmt->depth >> 3;
 
                                if (plane)
                                        height /= 2;
@@ -1148,7 +1164,8 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)
        frame_width = q_data->c_rect.width;
        frame_height = q_data->c_rect.height;
 
-       if (p_data->vb_part && fmt->fourcc == V4L2_PIX_FMT_NV12)
+       if (p_data->vb_part && (fmt->fourcc == V4L2_PIX_FMT_NV12 ||
+                               fmt->fourcc == V4L2_PIX_FMT_NV21))
                frame_height /= 2;
 
        vpdma_add_in_dtd(&ctx->desc_list, q_data->width, stride,