1 files changed, 23 insertions, 4 deletions

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index a848bd2af97f..7d754fbcccbf 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -650,9 +650,9 @@ static void vivi_stop_generating(struct vivi_dev *dev)
 /* ------------------------------------------------------------------
         Videobuf operations
    ------------------------------------------------------------------*/
-static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
-                                unsigned int *nplanes, unsigned long sizes[],
-                                void *alloc_ctxs[])
+static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
+                                unsigned int *nbuffers, unsigned int *nplanes,
+                                unsigned int sizes[], void *alloc_ctxs[])
 {
         struct vivi_dev *dev = vb2_get_drv_priv(vq);
         unsigned long size;
@@ -766,7 +766,7 @@ static void buffer_queue(struct vb2_buffer *vb)
         spin_unlock_irqrestore(&dev->slock, flags);
 }
 
-static int start_streaming(struct vb2_queue *vq)
+static int start_streaming(struct vb2_queue *vq, unsigned int count)
 {
         struct vivi_dev *dev = vb2_get_drv_priv(vq);
         dprintk(dev, 1, "%s\n", __func__);
@@ -852,6 +852,11 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                 (f->fmt.pix.width * dev->fmt->depth) >> 3;
         f->fmt.pix.sizeimage =
                 f->fmt.pix.height * f->fmt.pix.bytesperline;
+        if (dev->fmt->fourcc == V4L2_PIX_FMT_YUYV ||
+            dev->fmt->fourcc == V4L2_PIX_FMT_UYVY)
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+        else
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
         return 0;
 }
 
@@ -885,6 +890,11 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                 (f->fmt.pix.width * fmt->depth) >> 3;
         f->fmt.pix.sizeimage =
                 f->fmt.pix.height * f->fmt.pix.bytesperline;
+        if (fmt->fourcc == V4L2_PIX_FMT_YUYV ||
+            fmt->fourcc == V4L2_PIX_FMT_UYVY)
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
+        else
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
         return 0;
 }
 
@@ -948,6 +958,14 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
         return vb2_streamoff(&dev->vb_vidq, i);
 }
 
+static int vidioc_log_status(struct file *file, void *priv)
+{
+        struct vivi_dev *dev = video_drvdata(file);
+
+        v4l2_ctrl_handler_log_status(&dev->ctrl_handler, dev->v4l2_dev.name);
+        return 0;
+}
+
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *i)
 {
         return 0;
@@ -1191,6 +1209,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = {
         .vidioc_s_input       = vidioc_s_input,
         .vidioc_streamon      = vidioc_streamon,
         .vidioc_streamoff     = vidioc_streamoff,
+        .vidioc_log_status    = vidioc_log_status,
         .vidioc_subscribe_event = vidioc_subscribe_event,
         .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };