[Patch 16/16] media: ti-vpe: vpe: don't rely on colorspace member for conversion

[Benoit Parrot]

Up to now VPE was relying on the colorspace value of struct v4l2_format
as an indication to perform color space conversion from YUV to RGB or
not.

Instead we should used the source/destination fourcc codes as a more
reliable indication to perform color space conversion or not.

Signed-off-by: Benoit Parrot <bpar...@ti.com>
---
 drivers/media/platform/ti-vpe/vpe.c | 41 ++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/drivers/media/platform/ti-vpe/vpe.c 
b/drivers/media/platform/ti-vpe/vpe.c
index e30981cd3e8f..d002adc6263f 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -353,6 +353,32 @@ enum {
        Q_DATA_DST = 1,
 };
 
+static bool is_fmt_rgb(u32 fourcc)
+{
+       if (fourcc == V4L2_PIX_FMT_RGB24 ||
+           fourcc == V4L2_PIX_FMT_BGR24 ||
+           fourcc == V4L2_PIX_FMT_RGB32 ||
+           fourcc == V4L2_PIX_FMT_BGR32 ||
+           fourcc == V4L2_PIX_FMT_RGB565 ||
+           fourcc == V4L2_PIX_FMT_RGB555)
+               return true;
+
+       return false;
+}
+
+/*
+ * This helper is only used to setup the color space converter
+ * the actual value returned is only to broadly differentiate between
+ * RGB and YUV
+ */
+static enum  v4l2_colorspace fourcc_to_colorspace(u32 fourcc)
+{
+       if (is_fmt_rgb(fourcc))
+               return V4L2_COLORSPACE_SRGB;
+
+       return V4L2_COLORSPACE_SMPTE170M;
+}
+
 /* find our format description corresponding to the passed v4l2_format */
 static struct vpe_fmt *__find_format(u32 fourcc)
 {
@@ -764,11 +790,10 @@ static void set_src_registers(struct vpe_ctx *ctx)
 static void set_dst_registers(struct vpe_ctx *ctx)
 {
        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
-       enum v4l2_colorspace clrspc = ctx->q_data[Q_DATA_DST].colorspace;
        struct vpe_fmt *fmt = ctx->q_data[Q_DATA_DST].fmt;
        u32 val = 0;
 
-       if (clrspc == V4L2_COLORSPACE_SRGB) {
+       if (is_fmt_rgb(fmt->fourcc)) {
                val |= VPE_RGB_OUT_SELECT;
                vpdma_set_bg_color(ctx->dev->vpdma,
                        (struct vpdma_data_format *)fmt->vpdma_fmt[0], 0xff);
@@ -912,7 +937,8 @@ static int set_srcdst_params(struct vpe_ctx *ctx)
        set_dei_regs(ctx);
 
        csc_set_coeff(ctx->dev->csc, &mmr_adb->csc_regs[0],
-               s_q_data->colorspace, d_q_data->colorspace);
+                     fourcc_to_colorspace(s_q_data->fmt->fourcc),
+                     fourcc_to_colorspace(d_q_data->fmt->fourcc));
 
        sc_set_hs_coeffs(ctx->dev->sc, ctx->sc_coeff_h.addr, src_w, dst_w);
        sc_set_vs_coeffs(ctx->dev->sc, ctx->sc_coeff_v.addr, src_h, dst_h);
@@ -1285,7 +1311,7 @@ static void device_run(void *priv)
        if (ctx->deinterlacing)
                add_out_dtd(ctx, VPE_PORT_MV_OUT);
 
-       if (d_q_data->colorspace == V4L2_COLORSPACE_SRGB) {
+       if (is_fmt_rgb(d_q_data->fmt->fourcc)) {
                add_out_dtd(ctx, VPE_PORT_RGB_OUT);
        } else {
                add_out_dtd(ctx, VPE_PORT_LUMA_OUT);
@@ -1327,7 +1353,7 @@ static void device_run(void *priv)
        }
 
        /* sync on channel control descriptors for output ports */
-       if (d_q_data->colorspace == V4L2_COLORSPACE_SRGB) {
+       if (is_fmt_rgb(d_q_data->fmt->fourcc)) {
                vpdma_add_sync_on_channel_ctd(&ctx->desc_list,
                        VPE_CHAN_RGB_OUT);
        } else {
@@ -1682,10 +1708,7 @@ static int __vpe_try_fmt(struct vpe_ctx *ctx, struct 
v4l2_format *f,
                height = pix->height;
 
        if (!pix->colorspace) {
-               if (fmt->fourcc == V4L2_PIX_FMT_RGB24 ||
-                               fmt->fourcc == V4L2_PIX_FMT_BGR24 ||
-                               fmt->fourcc == V4L2_PIX_FMT_RGB32 ||
-                               fmt->fourcc == V4L2_PIX_FMT_BGR32) {
+               if (is_fmt_rgb(fmt->fourcc)) {
                        pix->colorspace = V4L2_COLORSPACE_SRGB;
                } else {
                        if (height > 1280)      /* HD */
-- 
2.17.1