[PATCH v4 25/27] rcar-vin: extend {start,stop}_streaming to work with media controller

[Niklas Söderlund]

The procedure to start or stop streaming using the none MC single
subdevice and the MC graph and multiple subdevices are quiet different.
Create a new function to abstract which method is used based on which
mode the driver is running in and add logic to start the MC graph.

Signed-off-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
---
 drivers/media/platform/rcar-vin/rcar-dma.c | 79 +++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c 
b/drivers/media/platform/rcar-vin/rcar-dma.c
index 34f01f32bab7bd32..46491a6b63ed0397 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -1099,15 +1099,82 @@ static void rvin_buffer_queue(struct vb2_buffer *vb)
        spin_unlock_irqrestore(&vin->qlock, flags);
 }
 
+static int rvin_set_stream(struct rvin_dev *vin, int on)
+{
+       struct v4l2_subdev_format fmt = {
+               .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+       };
+       struct media_pipeline *pipe;
+       struct  v4l2_subdev *sd;
+       struct media_pad *pad;
+       int ret;
+
+       /* Not media controller used, simply pass operation to subdevice */
+       if (!vin->info->use_mc) {
+               ret = v4l2_subdev_call(vin->digital.subdev, video, s_stream,
+                                      on);
+
+               return ret == -ENOIOCTLCMD ? 0 : ret;
+       }
+
+       pad = media_entity_remote_pad(&vin->pad);
+       if (!pad)
+               return -EPIPE;
+
+       sd = media_entity_to_v4l2_subdev(pad->entity);
+       if (!sd)
+               return -EPIPE;
+
+       if (on) {
+               fmt.pad = pad->index;
+               if (v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt))
+                       return -EPIPE;
+
+               switch (fmt.format.code) {
+               case MEDIA_BUS_FMT_YUYV8_1X16:
+               case MEDIA_BUS_FMT_UYVY8_2X8:
+               case MEDIA_BUS_FMT_UYVY10_2X10:
+               case MEDIA_BUS_FMT_RGB888_1X24:
+                       vin->code = fmt.format.code;
+                       break;
+               default:
+                       return -EPIPE;
+               }
+
+               if (fmt.format.width != vin->format.width ||
+                   fmt.format.height != vin->format.height)
+                       return -EPIPE;
+
+               pipe = sd->entity.pipe ? sd->entity.pipe : &vin->vdev->pipe;
+               if (media_pipeline_start(&vin->vdev->entity, pipe))
+                       return -EPIPE;
+
+               ret = v4l2_subdev_call(sd, video, s_stream, 1);
+               if (ret == -ENOIOCTLCMD)
+                       ret = 0;
+               if (ret)
+                       media_pipeline_stop(&vin->vdev->entity);
+       } else {
+               media_pipeline_stop(&vin->vdev->entity);
+               ret = v4l2_subdev_call(sd, video, s_stream, 0);
+       }
+
+       return ret;
+}
+
 static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
        struct rvin_dev *vin = vb2_get_drv_priv(vq);
-       struct v4l2_subdev *sd;
        unsigned long flags;
        int ret;
 
-       sd = vin_to_source(vin);
-       v4l2_subdev_call(sd, video, s_stream, 1);
+       ret = rvin_set_stream(vin, 1);
+       if (ret) {
+               spin_lock_irqsave(&vin->qlock, flags);
+               return_all_buffers(vin, VB2_BUF_STATE_QUEUED);
+               spin_unlock_irqrestore(&vin->qlock, flags);
+               return ret;
+       }
 
        spin_lock_irqsave(&vin->qlock, flags);
 
@@ -1116,7 +1183,7 @@ static int rvin_start_streaming(struct vb2_queue *vq, 
unsigned int count)
        ret = rvin_capture_start(vin);
        if (ret) {
                return_all_buffers(vin, VB2_BUF_STATE_QUEUED);
-               v4l2_subdev_call(sd, video, s_stream, 0);
+               rvin_set_stream(vin, 0);
        }
 
        spin_unlock_irqrestore(&vin->qlock, flags);
@@ -1127,7 +1194,6 @@ static int rvin_start_streaming(struct vb2_queue *vq, 
unsigned int count)
 static void rvin_stop_streaming(struct vb2_queue *vq)
 {
        struct rvin_dev *vin = vb2_get_drv_priv(vq);
-       struct v4l2_subdev *sd;
        unsigned long flags;
        int retries = 0;
 
@@ -1166,8 +1232,7 @@ static void rvin_stop_streaming(struct vb2_queue *vq)
 
        spin_unlock_irqrestore(&vin->qlock, flags);
 
-       sd = vin_to_source(vin);
-       v4l2_subdev_call(sd, video, s_stream, 0);
+       rvin_set_stream(vin, 0);
 
        /* disable interrupts */
        rvin_disable_interrupts(vin);
-- 
2.12.2