v4l: ti-vps: vip: Add support for RGB capture

Add ARGB capture format (32 bits including alpha)
Corrected channel number to be used for RGB capture
Allow setting RGB_LO mux select from the slice

Currently, CSC is not enabled, so input and output formats are same
For now, RGB capture is only passthrough mode.

Change-Id: Ic8b2256607b0df21b7e34e58634b1de367d1d74a
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>

2 files changed, 59 insertions, 1 deletions

diff --git a/drivers/media/platform/ti-vps/vip.c b/drivers/media/platform/ti-vps/vip.c
index 1af428ae86d..76eb997674a 100644
--- a/drivers/media/platform/ti-vps/vip.c
+++ b/drivers/media/platform/ti-vps/vip.c
@@ -98,7 +98,7 @@ static struct vip_srce_info srce_info[5] = {
                 .vb_part        = VIP_CHROMA,
         },
         [VIP_SRCE_RGB] = {
-                .base_channel   = VIP1_CHAN_NUM_PORT_A_RGB,
+                .base_channel   = VIP1_CHAN_NUM_PORT_B_RGB,
                 .vb_part        = VIP_LUMA,
         },
 };
@@ -171,6 +171,14 @@ static struct vip_fmt vip_formats[] = {
                 .vpdma_fmt      = { &vpdma_rgb_fmts[VPDMA_DATA_FMT_RGB24],
                                   },
         },
+        {
+                .name           = "ARGB888 packed",
+                .fourcc         = V4L2_PIX_FMT_RGB32,
+                .colorspace     = V4L2_COLORSPACE_SRGB,
+                .coplanar       = 0,
+                .vpdma_fmt      = { &vpdma_rgb_fmts[VPDMA_DATA_FMT_ARGB32],
+                                  },
+        },
 };
 
 /*
@@ -337,6 +345,33 @@ static void vip_top_vpdma_reset(struct vip_shared *shared)
         write_sreg(shared, VIP_CLK_RESET, val);
 }
 
+static void vip_xtra_set_repack_sel(struct vip_port *port, int repack_mode)
+{
+        u32 val;
+
+        if (port->port_id == 0 && port->dev->slice_id == VIP_SLICE1) {
+                val = read_vreg(port->dev, VIP1_PARSER_REG_OFFSET + VIP_PARSER_PORTA_1);
+                insert_field(&val, repack_mode, VIP_REPACK_SEL_MASK, VIP_REPACK_SEL_SHFT);
+
+                write_vreg(port->dev, VIP1_PARSER_REG_OFFSET + VIP_PARSER_PORTA_1, val);
+        } else if (port->port_id == 0 && port->dev->slice_id == VIP_SLICE2) {
+                val = read_vreg(port->dev, VIP2_PARSER_REG_OFFSET + VIP_PARSER_PORTA_1);
+                insert_field(&val, repack_mode, VIP_REPACK_SEL_MASK, VIP_REPACK_SEL_SHFT);
+
+                write_vreg(port->dev, VIP2_PARSER_REG_OFFSET + VIP_PARSER_PORTA_1, val);
+        } else if (port->port_id == 1 && port->dev->slice_id == VIP_SLICE1) {
+                val = read_vreg(port->dev, VIP1_PARSER_REG_OFFSET + VIP_PARSER_PORTB_1);
+                insert_field(&val, repack_mode, VIP_REPACK_SEL_MASK, VIP_REPACK_SEL_SHFT);
+
+                write_vreg(port->dev, VIP1_PARSER_REG_OFFSET + VIP_PARSER_PORTB_1, val);
+        } else if (port->port_id == 1 && port->dev->slice_id == VIP_SLICE2) {
+                val = read_vreg(port->dev, VIP2_PARSER_REG_OFFSET + VIP_PARSER_PORTB_1);
+                insert_field(&val, repack_mode, VIP_REPACK_SEL_MASK, VIP_REPACK_SEL_SHFT);
+
+                write_vreg(port->dev, VIP2_PARSER_REG_OFFSET + VIP_PARSER_PORTB_1, val);
+        }
+}
+
 static void vip_set_discrete_basic_mode(struct vip_port *port)
 {
         u32 val;
@@ -678,6 +713,19 @@ static void vip_set_slice_path(struct vip_dev *dev, enum data_path_select data_p
                         write_vreg(dev, VIP_VIP2_DATA_PATH_SELECT, val);
                 }
                 break;
+        case VIP_RGB_OUT_LO_DATA_SELECT:
+                if (dev->slice_id == VIP_SLICE1) {
+                        val |= VIP_RGB_OUT_LO_SRC_SELECT;
+                        insert_field(&val, data_path, VIP_DATAPATH_SELECT_MASK, VIP_DATAPATH_SELECT_SHFT);
+
+                        write_vreg(dev, VIP_VIP1_DATA_PATH_SELECT, val);
+                } else if (dev->slice_id == VIP_SLICE2) {
+                        val |= VIP_RGB_OUT_LO_SRC_SELECT;
+                        insert_field(&val, data_path, VIP_DATAPATH_SELECT_MASK, VIP_DATAPATH_SELECT_SHFT);
+
+                        write_vreg(dev, VIP_VIP2_DATA_PATH_SELECT, val);
+                }
+                break;
         default:
                 BUG();
         }
@@ -1110,8 +1158,17 @@ static int vip_try_fmt_vid_cap(struct file *file, void *priv,
  */
 static void set_fmt_params(struct vip_stream *stream)
 {
+        struct vip_dev *dev = stream->port->dev;
+
         stream->sequence = 0;
         stream->field = V4L2_FIELD_TOP;
+
+        if (stream->port->fmt->colorspace == V4L2_COLORSPACE_SRGB) {
+                vip_set_slice_path(dev, VIP_RGB_OUT_LO_DATA_SELECT);
+                /* Set alpha component in background color */
+                vpdma_set_bg_color(dev->shared->vpdma,
+                        stream->port->fmt->vpdma_fmt[0], 0xff);
+        }
 }
 
 static int vip_s_fmt_vid_cap(struct file *file, void *priv,
diff --git a/drivers/media/platform/ti-vps/vpdma_priv.h b/drivers/media/platform/ti-vps/vpdma_priv.h
index 49c304ad92f..b3595795c3e 100644
--- a/drivers/media/platform/ti-vps/vpdma_priv.h
+++ b/drivers/media/platform/ti-vps/vpdma_priv.h
@@ -128,6 +128,7 @@
 #define VIP1_CHAN_NUM_PORT_B_LUMA       104
 #define VIP1_CHAN_NUM_PORT_B_CHROMA     105
 #define VIP1_CHAN_NUM_PORT_A_RGB        106
+#define VIP1_CHAN_NUM_PORT_B_RGB        107
 
 /*
  * a VPDMA address data block payload for a configuration descriptor needs to