|
@@ -996,10 +996,126 @@ static void rvin_buffer_queue(struct vb2_buffer *vb)
|
|
|
spin_unlock_irqrestore(&vin->qlock, flags);
|
|
|
}
|
|
|
|
|
|
+static int rvin_mc_validate_format(struct rvin_dev *vin, struct v4l2_subdev *sd,
|
|
|
+ struct media_pad *pad)
|
|
|
+{
|
|
|
+ struct v4l2_subdev_format fmt = {
|
|
|
+ .which = V4L2_SUBDEV_FORMAT_ACTIVE,
|
|
|
+ };
|
|
|
+
|
|
|
+ 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->mbus_code = fmt.format.code;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ return -EPIPE;
|
|
|
+ }
|
|
|
+
|
|
|
+ switch (fmt.format.field) {
|
|
|
+ case V4L2_FIELD_TOP:
|
|
|
+ case V4L2_FIELD_BOTTOM:
|
|
|
+ case V4L2_FIELD_NONE:
|
|
|
+ case V4L2_FIELD_INTERLACED_TB:
|
|
|
+ case V4L2_FIELD_INTERLACED_BT:
|
|
|
+ case V4L2_FIELD_INTERLACED:
|
|
|
+ case V4L2_FIELD_SEQ_TB:
|
|
|
+ case V4L2_FIELD_SEQ_BT:
|
|
|
+ /* Supported natively */
|
|
|
+ break;
|
|
|
+ case V4L2_FIELD_ALTERNATE:
|
|
|
+ switch (vin->format.field) {
|
|
|
+ case V4L2_FIELD_TOP:
|
|
|
+ case V4L2_FIELD_BOTTOM:
|
|
|
+ case V4L2_FIELD_NONE:
|
|
|
+ break;
|
|
|
+ case V4L2_FIELD_INTERLACED_TB:
|
|
|
+ case V4L2_FIELD_INTERLACED_BT:
|
|
|
+ case V4L2_FIELD_INTERLACED:
|
|
|
+ case V4L2_FIELD_SEQ_TB:
|
|
|
+ case V4L2_FIELD_SEQ_BT:
|
|
|
+ /* Use VIN hardware to combine the two fields */
|
|
|
+ fmt.format.height *= 2;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ return -EPIPE;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ return -EPIPE;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (fmt.format.width != vin->format.width ||
|
|
|
+ fmt.format.height != vin->format.height ||
|
|
|
+ fmt.format.code != vin->mbus_code)
|
|
|
+ return -EPIPE;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int rvin_set_stream(struct rvin_dev *vin, int on)
|
|
|
+{
|
|
|
+ struct media_pipeline *pipe;
|
|
|
+ struct media_device *mdev;
|
|
|
+ struct v4l2_subdev *sd;
|
|
|
+ struct media_pad *pad;
|
|
|
+ int ret;
|
|
|
+
|
|
|
+ /* No 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 (!on) {
|
|
|
+ media_pipeline_stop(&vin->vdev.entity);
|
|
|
+ return v4l2_subdev_call(sd, video, s_stream, 0);
|
|
|
+ }
|
|
|
+
|
|
|
+ ret = rvin_mc_validate_format(vin, sd, pad);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * The graph lock needs to be taken to protect concurrent
|
|
|
+ * starts of multiple VIN instances as they might share
|
|
|
+ * a common subdevice down the line and then should use
|
|
|
+ * the same pipe.
|
|
|
+ */
|
|
|
+ mdev = vin->vdev.entity.graph_obj.mdev;
|
|
|
+ mutex_lock(&mdev->graph_mutex);
|
|
|
+ pipe = sd->entity.pipe ? sd->entity.pipe : &vin->vdev.pipe;
|
|
|
+ ret = __media_pipeline_start(&vin->vdev.entity, pipe);
|
|
|
+ mutex_unlock(&mdev->graph_mutex);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ ret = v4l2_subdev_call(sd, video, s_stream, 1);
|
|
|
+ if (ret == -ENOIOCTLCMD)
|
|
|
+ ret = 0;
|
|
|
+ if (ret)
|
|
|
+ media_pipeline_stop(&vin->vdev.entity);
|
|
|
+
|
|
|
+ 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;
|
|
|
|
|
@@ -1014,8 +1130,13 @@ static int rvin_start_streaming(struct vb2_queue *vq, unsigned int count)
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- 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);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
|
|
|
spin_lock_irqsave(&vin->qlock, flags);
|
|
|
|
|
@@ -1024,11 +1145,11 @@ 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);
|
|
|
-
|
|
|
+out:
|
|
|
if (ret)
|
|
|
dma_free_coherent(vin->dev, vin->format.sizeimage, vin->scratch,
|
|
|
vin->scratch_phys);
|
|
@@ -1039,7 +1160,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;
|
|
|
|
|
@@ -1078,8 +1198,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);
|