v4l: xilinx: sdirxss: Add v4l control for transport stream type

Add v4l control to get the transport stream type as interlaced
or progressive. In case ST352 payload is not available, fallback
to detecting the transport type from the rx_t_scan bit.

Signed-off-by: Vishal Sagar <vsagar@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/media/platform/xilinx/xilinx-sdirxss.c b/drivers/media/platform/xilinx/xilinx-sdirxss.c
index 9025b94bc44897a056ff2ea00fda4403f67bf9aa..71390a6da49bd43c38a18f128e6545571013f7f9 100644 (file)
--- a/drivers/media/platform/xilinx/xilinx-sdirxss.c
+++ b/drivers/media/platform/xilinx/xilinx-sdirxss.c
@@ -292,6 +292,7 @@ struct xsdirxss_core {
  * @pads: media pads
  * @streaming: Flag for storing streaming state
  * @vidlocked: Flag indicating SDI Rx has locked onto video stream
+ * @ts_is_interlaced: Flag indicating Transport Stream is interlaced.
  *
  * This structure contains the device driver related parameters
  */
@@ -307,6 +308,7 @@ struct xsdirxss_state {
        struct media_pad pads[XSDIRX_MEDIA_PADS];
        bool streaming;
        bool vidlocked;
+       bool ts_is_interlaced;
 };
 
 static inline struct xsdirxss_state *
@@ -613,17 +615,23 @@ static int xsdirx_get_stream_properties(struct xsdirxss_state *state)
                                XST352_BYTE2_PIC_TYPE_OFFSET;
                framerate = (payload >> XST352_BYTE2_FPS_SHIFT) &
                                XST352_BYTE2_FPS_MASK;
+               tscan = (payload & XST352_BYTE2_TS_TYPE_MASK) >>
+                               XST352_BYTE2_TS_TYPE_OFFSET;
        } else {
                dev_dbg(core->dev, "No ST352 payload available : Mode = %d\n",
                        mode);
                framerate = (val & XSDIRX_TS_DET_STAT_RATE_MASK) >>
                                XSDIRX_TS_DET_STAT_RATE_OFFSET;
+               tscan = (val & XSDIRX_TS_DET_STAT_SCAN_MASK) >>
+                               XSDIRX_TS_DET_STAT_SCAN_OFFSET;
        }
 
        family = (val & XSDIRX_TS_DET_STAT_FAMILY_MASK) >>
                  XSDIRX_TS_DET_STAT_FAMILY_OFFSET;
-       tscan = (val & XSDIRX_TS_DET_STAT_SCAN_MASK) >>
-                XSDIRX_TS_DET_STAT_SCAN_OFFSET;
+       state->ts_is_interlaced = tscan ? false : true;
+
+       dev_dbg(core->dev, "ts_is_interlaced = %d, family = %d\n",
+               state->ts_is_interlaced, family);
 
        switch (mode) {
        case XSDIRX_MODE_HD_MASK:
@@ -1086,6 +1094,13 @@ static int xsdirxss_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
                        return -EINVAL;
                }
                break;
+       case V4L2_CID_XILINX_SDIRX_TS_IS_INTERLACED:
+               if (!xsdirxss->vidlocked) {
+                       dev_err(core->dev, "Can't get values when video not locked!\n");
+                       return -EINVAL;
+               }
+               ctrl->val = xsdirxss->ts_is_interlaced;
+               break;
        default:
                dev_err(core->dev, "Get Invalid control id 0x%0x\n", ctrl->id);
                return -EINVAL;
@@ -1410,6 +1425,16 @@ static struct v4l2_ctrl_config xsdirxss_ctrls[] = {
                .step   = 1,
                .def    = 0,
                .flags  = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,
+       }, {
+               .ops    = &xsdirxss_ctrl_ops,
+               .id     = V4L2_CID_XILINX_SDIRX_TS_IS_INTERLACED,
+               .name   = "SDI Rx : TS is Interlaced",
+               .type   = V4L2_CTRL_TYPE_BOOLEAN,
+               .min    = false,
+               .max    = true,
+               .def    = false,
+               .step   = 1,
+               .flags  = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,
        }
 };
 

diff --git a/include/uapi/linux/xilinx-v4l2-controls.h b/include/uapi/linux/xilinx-v4l2-controls.h
index 6436d934e7a5d19ec9de92d796e54f66bc846712..8fd30b0790d589b266311e66e4233bafbb145dfc 100644 (file)
--- a/include/uapi/linux/xilinx-v4l2-controls.h
+++ b/include/uapi/linux/xilinx-v4l2-controls.h
@@ -195,5 +195,6 @@
 #define V4L2_CID_XILINX_SDIRX_EDH_ERRCNT       (V4L2_CID_XILINX_SDIRX + 7)
 /* Get EDH status control */
 #define V4L2_CID_XILINX_SDIRX_EDH_STATUS       (V4L2_CID_XILINX_SDIRX + 8)
-
+/* Get Transport Interlaced status */
+#define V4L2_CID_XILINX_SDIRX_TS_IS_INTERLACED (V4L2_CID_XILINX_SDIRX + 9)
 #endif /* __UAPI_XILINX_V4L2_CONTROLS_H__ */