Merge branch 'patchwork' into v4l_for_linus

* patchwork: (404 commits)
  [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
  [media] uvcvideo: fix cropcap v4l2-compliance failure
  [media] media: omap3isp: remove unused clkdev
  [media] coda: Add tracing support
  [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
  [media] coda: fix fill bitstream errors in nonstreaming case
  [media] coda: call SEQ_END when the first queue is stopped
  [media] coda: fail to start streaming if userspace set invalid formats
  [media] coda: remove duplicate error messages for buffer allocations
  [media] coda: move parameter buffer in together with context buffer allocation
  [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
  [media] coda: allocate per-context buffers from REQBUFS
  [media] coda: use strlcpy instead of snprintf
  [media] coda: bitstream payload is unsigned
  [media] coda: fix double call to debugfs_remove
  [media] coda: check kasprintf return value in coda_open
  [media] coda: bitrate can only be set in kbps steps
  [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
  [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
  [media] coda: set allow_zero_bytesused flag for vb2_queue_init
  ...

1 files changed, 33 insertions, 25 deletions

diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index b8e4b68a9196..79aee30d5fd8 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -39,6 +39,7 @@
 #include "cx18-cards.h"
 #include "cx18-av-core.h"
 #include <media/tveeprom.h>
+#include <media/v4l2-event.h>
 
 u16 cx18_service2vbi(int type)
 {
@@ -159,7 +160,7 @@ static int cx18_g_fmt_vid_cap(struct file *file, void *fh,
         if (id->type == CX18_ENC_STREAM_TYPE_YUV) {
                 pixfmt->pixelformat = s->pixelformat;
                 pixfmt->sizeimage = s->vb_bytes_per_frame;
-                pixfmt->bytesperline = 720;
+                pixfmt->bytesperline = s->vb_bytes_per_line;
         } else {
                 pixfmt->pixelformat = V4L2_PIX_FMT_MPEG;
                 pixfmt->sizeimage = 128 * 1024;
@@ -287,10 +288,13 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
         s->pixelformat = fmt->fmt.pix.pixelformat;
         /* HM12 YUV size is (Y=(h*720) + UV=(h*(720/2)))
            UYUV YUV size is (Y=(h*720) + UV=(h*(720))) */
-        if (s->pixelformat == V4L2_PIX_FMT_HM12)
+        if (s->pixelformat == V4L2_PIX_FMT_HM12) {
                 s->vb_bytes_per_frame = h * 720 * 3 / 2;
-        else
+                s->vb_bytes_per_line = 720; /* First plane */
+        } else {
                 s->vb_bytes_per_frame = h * 720 * 2;
+                s->vb_bytes_per_line = 1440; /* Packed */
+        }
 
         mbus_fmt.width = cx->cxhdl.width = w;
         mbus_fmt.height = cx->cxhdl.height = h;
@@ -447,34 +451,29 @@ static int cx18_cropcap(struct file *file, void *fh,
 
         if (cropcap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
-        cropcap->bounds.top = cropcap->bounds.left = 0;
-        cropcap->bounds.width = 720;
-        cropcap->bounds.height = cx->is_50hz ? 576 : 480;
         cropcap->pixelaspect.numerator = cx->is_50hz ? 59 : 10;
         cropcap->pixelaspect.denominator = cx->is_50hz ? 54 : 11;
-        cropcap->defrect = cropcap->bounds;
         return 0;
 }
 
-static int cx18_s_crop(struct file *file, void *fh, const struct v4l2_crop *crop)
-{
-        struct cx18_open_id *id = fh2id(fh);
-        struct cx18 *cx = id->cx;
-
-        if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                return -EINVAL;
-        CX18_DEBUG_WARN("VIDIOC_S_CROP not implemented\n");
-        return -EINVAL;
-}
-
-static int cx18_g_crop(struct file *file, void *fh, struct v4l2_crop *crop)
+static int cx18_g_selection(struct file *file, void *fh,
+                            struct v4l2_selection *sel)
 {
         struct cx18 *cx = fh2id(fh)->cx;
 
-        if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
-        CX18_DEBUG_WARN("VIDIOC_G_CROP not implemented\n");
-        return -EINVAL;
+        switch (sel->target) {
+        case V4L2_SEL_TGT_CROP_BOUNDS:
+        case V4L2_SEL_TGT_CROP_DEFAULT:
+                sel->r.top = sel->r.left = 0;
+                sel->r.width = 720;
+                sel->r.height = cx->is_50hz ? 576 : 480;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
 }
 
 static int cx18_enum_fmt_vid_cap(struct file *file, void *fh,
@@ -510,6 +509,9 @@ int cx18_s_input(struct file *file, void *fh, unsigned int inp)
 {
         struct cx18_open_id *id = fh2id(fh);
         struct cx18 *cx = id->cx;
+        v4l2_std_id std = V4L2_STD_ALL;
+        const struct cx18_card_video_input *card_input =
+                                cx->card->video_inputs + inp;
 
         if (inp >= cx->nof_inputs)
                 return -EINVAL;
@@ -525,6 +527,11 @@ int cx18_s_input(struct file *file, void *fh, unsigned int inp)
         cx->active_input = inp;
         /* Set the audio input to whatever is appropriate for the input type. */
         cx->audio_input = cx->card->video_inputs[inp].audio_index;
+        if (card_input->video_type == V4L2_INPUT_TYPE_TUNER)
+                std = cx->tuner_std;
+        cx->streams[CX18_ENC_STREAM_TYPE_MPG].video_dev.tvnorms = std;
+        cx->streams[CX18_ENC_STREAM_TYPE_YUV].video_dev.tvnorms = std;
+        cx->streams[CX18_ENC_STREAM_TYPE_VBI].video_dev.tvnorms = std;
 
         /* prevent others from messing with the streams until
            we're finished changing inputs. */
@@ -1036,7 +1043,7 @@ static int cx18_log_status(struct file *file, void *fh)
         for (i = 0; i < CX18_MAX_STREAMS; i++) {
                 struct cx18_stream *s = &cx->streams[i];
 
-                if (s->video_dev == NULL || s->buffers == 0)
+                if (s->video_dev.v4l2_dev == NULL || s->buffers == 0)
                         continue;
                 CX18_INFO("Stream %s: status 0x%04lx, %d%% of %d KiB (%d buffers) in use\n",
                           s->name, s->s_flags,
@@ -1078,8 +1085,7 @@ static const struct v4l2_ioctl_ops cx18_ioctl_ops = {
         .vidioc_enumaudio               = cx18_enumaudio,
         .vidioc_enum_input              = cx18_enum_input,
         .vidioc_cropcap                 = cx18_cropcap,
-        .vidioc_s_crop                  = cx18_s_crop,
-        .vidioc_g_crop                  = cx18_g_crop,
+        .vidioc_g_selection             = cx18_g_selection,
         .vidioc_g_input                 = cx18_g_input,
         .vidioc_s_input                 = cx18_s_input,
         .vidioc_g_frequency             = cx18_g_frequency,
@@ -1114,6 +1120,8 @@ static const struct v4l2_ioctl_ops cx18_ioctl_ops = {
         .vidioc_querybuf                = cx18_querybuf,
         .vidioc_qbuf                    = cx18_qbuf,
         .vidioc_dqbuf                   = cx18_dqbuf,
+        .vidioc_subscribe_event         = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event       = v4l2_event_unsubscribe,
 };
 
 void cx18_set_funcs(struct video_device *vdev)