Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
  [media] pctv452e: Remove bogus code
  [media] adv7175: Make use of media bus pixel codes
  [media] media: vb2: fix incorrect return value
  [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
  [media] cx23885: Stop the risc video fifo before reconfiguring it
  [media] cx23885: Avoid incorrect error handling and reporting
  [media] cx23885: Avoid stopping the risc engine during buffer timeout
  [media] cx23885: Removed a spurious function cx23885_set_scale()
  [media] cx23885: v4l2 api compliance, set the audioset field correctly
  [media] cx23885: hook the audio selection functions into the main driver
  [media] cx23885: add generic functions for dealing with audio input selection
  [media] cx23885: fixes related to maximum number of inputs and range checking
  [media] cx23885: Initial support for the MPX-885 mini-card
  [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
  [media] cx23885: Enable audio line in support from the back panel
  [media] cx23885: Allow the audio mux config to be specified on a per input basis
  [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
  [media] cx23885: Name an internal i2c part and declare a bitfield by name
  [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
  [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
  ...

Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
file rename vs add)

6 files changed, 29 insertions, 17 deletions

diff --git a/drivers/media/video/cx18/Makefile b/drivers/media/video/cx18/Makefile
index 2fadd9ded34..a86bab5893e 100644
--- a/drivers/media/video/cx18/Makefile
+++ b/drivers/media/video/cx18/Makefile
@@ -8,6 +8,6 @@ cx18-alsa-objs := cx18-alsa-main.o cx18-alsa-pcm.o
 obj-$(CONFIG_VIDEO_CX18) += cx18.o
 obj-$(CONFIG_VIDEO_CX18_ALSA) += cx18-alsa.o
 
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
-EXTRA_CFLAGS += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/dvb/dvb-core
+ccflags-y += -Idrivers/media/dvb/frontends
+ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 18342072306..b9a94fc5146 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -409,6 +409,7 @@ struct cx18_stream {
 
         /* Videobuf for YUV video */
         u32 pixelformat;
+        u32 vb_bytes_per_frame;
         struct list_head vb_capture;    /* video capture queue */
         spinlock_t vb_lock;
         struct timer_list vb_timeout;
@@ -430,10 +431,6 @@ struct cx18_open_id {
         u32 open_id;
         int type;
         struct cx18 *cx;
-
-        struct videobuf_queue vbuf_q;
-        spinlock_t s_lock; /* Protect vbuf_q */
-        enum v4l2_buf_type vb_type;
 };
 
 static inline struct cx18_open_id *fh2id(struct v4l2_fh *fh)
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 07411f34885..14cb961c22b 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -784,8 +784,6 @@ int cx18_v4l2_close(struct file *filp)
                 cx18_release_stream(s);
         } else {
                 cx18_stop_capture(id, 0);
-                if (id->type == CX18_ENC_STREAM_TYPE_YUV)
-                        videobuf_mmap_free(&id->vbuf_q);
         }
         kfree(id);
         mutex_unlock(&cx->serialize_lock);
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index afe0a29e720..66b1c15c354 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -160,12 +160,7 @@ static int cx18_g_fmt_vid_cap(struct file *file, void *fh,
         pixfmt->priv = 0;
         if (id->type == CX18_ENC_STREAM_TYPE_YUV) {
                 pixfmt->pixelformat = s->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)
-                        pixfmt->sizeimage = pixfmt->height * 720 * 3 / 2;
-                else
-                        pixfmt->sizeimage = pixfmt->height * 720 * 2;
+                pixfmt->sizeimage = s->vb_bytes_per_frame;
                 pixfmt->bytesperline = 720;
         } else {
                 pixfmt->pixelformat = V4L2_PIX_FMT_MPEG;
@@ -296,6 +291,12 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
                 return -EBUSY;
 
         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)
+                s->vb_bytes_per_frame = h * 720 * 3 / 2;
+        else
+                s->vb_bytes_per_frame = h * 720 * 2;
 
         mbus_fmt.width = cx->cxhdl.width = w;
         mbus_fmt.height = cx->cxhdl.height = h;
@@ -463,13 +464,16 @@ static int cx18_s_register(struct file *file, void *fh,
 static int cx18_querycap(struct file *file, void *fh,
                                 struct v4l2_capability *vcap)
 {
-        struct cx18 *cx = fh2id(fh)->cx;
+        struct cx18_open_id *id = fh2id(fh);
+        struct cx18 *cx = id->cx;
 
         strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));
         snprintf(vcap->bus_info, sizeof(vcap->bus_info),
                  "PCI:%s", pci_name(cx->pci_dev));
         vcap->capabilities = cx->v4l2_cap;          /* capabilities */
+        if (id->type == CX18_ENC_STREAM_TYPE_YUV)
+                vcap->capabilities |= V4L2_CAP_STREAMING;
         return 0;
 }
 
diff --git a/drivers/media/video/cx18/cx18-mailbox.c b/drivers/media/video/cx18/cx18-mailbox.c
index c07191e09fc..0c7796e76ac 100644
--- a/drivers/media/video/cx18/cx18-mailbox.c
+++ b/drivers/media/video/cx18/cx18-mailbox.c
@@ -196,7 +196,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s,
         }
 
         /* If we've filled the buffer as per the callers res then dispatch it */
-        if (vb_buf->bytes_used >= (vb_buf->vb.width * vb_buf->vb.height * 2)) {
+        if (vb_buf->bytes_used >= s->vb_bytes_per_frame) {
                 dispatch = 1;
                 vb_buf->bytes_used = 0;
         }
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 852f420fd27..638cca156b5 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -138,6 +138,12 @@ static int cx18_prepare_buffer(struct videobuf_queue *q,
                 buf->tvnorm    = cx->std;
                 s->pixelformat = 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)
+                        s->vb_bytes_per_frame = height * 720 * 3 / 2;
+                else
+                        s->vb_bytes_per_frame = height * 720 * 2;
                 cx18_dma_free(q, s, buf);
         }
 
@@ -154,6 +160,12 @@ static int cx18_prepare_buffer(struct videobuf_queue *q,
                 buf->tvnorm    = cx->std;
                 s->pixelformat = 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)
+                        s->vb_bytes_per_frame = height * 720 * 3 / 2;
+                else
+                        s->vb_bytes_per_frame = height * 720 * 2;
                 rc = videobuf_iolock(q, &buf->vb, NULL);
                 if (rc != 0)
                         goto fail;
@@ -287,6 +299,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
 
                 /* Assume the previous pixel default */
                 s->pixelformat = V4L2_PIX_FMT_HM12;
+                s->vb_bytes_per_frame = cx->cxhdl.height * 720 * 3 / 2;
         }
 }