]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
[media] media: ti-vpe: vpe: Add RGB565 and RGB5551 support
authorNikhil Devshatwar <nikhil.nd@ti.com>
Fri, 18 Nov 2016 23:20:28 +0000 (21:20 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 22 Nov 2016 10:01:10 +0000 (08:01 -0200)
VPE hardware can generate output in RGB565 or in RGB5551 format.
Add these formats in the supported format list for CAPTURE stream.
Also, for RGB5551 format, the alpha component is not processed,
so the alpha value is taken from the default color.
Set the default color to make alpha component full when the dst
format is of RGB color space.

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/ti-vpe/vpe.c

index 0f652a049edefdeba528b02979df9a0dc021f3dd..d3412accf5645880c7404eaec79273d831d821f8 100644 (file)
@@ -302,6 +302,22 @@ static struct vpe_fmt vpe_formats[] = {
                .vpdma_fmt      = { &vpdma_rgb_fmts[VPDMA_DATA_FMT_ABGR32],
                                  },
        },
+       {
+               .name           = "RGB565",
+               .fourcc         = V4L2_PIX_FMT_RGB565,
+               .types          = VPE_FMT_TYPE_CAPTURE,
+               .coplanar       = 0,
+               .vpdma_fmt      = { &vpdma_rgb_fmts[VPDMA_DATA_FMT_RGB565],
+                                 },
+       },
+       {
+               .name           = "RGB5551",
+               .fourcc         = V4L2_PIX_FMT_RGB555,
+               .types          = VPE_FMT_TYPE_CAPTURE,
+               .coplanar       = 0,
+               .vpdma_fmt      = { &vpdma_rgb_fmts[VPDMA_DATA_FMT_RGBA16_5551],
+                                 },
+       },
 };
 
 /*
@@ -738,9 +754,11 @@ static void set_dst_registers(struct vpe_ctx *ctx)
        struct vpe_fmt *fmt = ctx->q_data[Q_DATA_DST].fmt;
        u32 val = 0;
 
-       if (clrspc == V4L2_COLORSPACE_SRGB)
+       if (clrspc == V4L2_COLORSPACE_SRGB) {
                val |= VPE_RGB_OUT_SELECT;
-       else if (fmt->fourcc == V4L2_PIX_FMT_NV16)
+               vpdma_set_bg_color(ctx->dev->vpdma,
+                       (struct vpdma_data_format *)fmt->vpdma_fmt[0], 0xff);
+       } else if (fmt->fourcc == V4L2_PIX_FMT_NV16)
                val |= VPE_COLOR_SEPARATE_422;
 
        /*