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

Pull media updates from Mauro Carvalho Chehab:
 "The main set of series of patches for media subsystem, including:
   - document RC sysfs class
   - added an API to setup scancode to allow waking up systems using the
     Remote Controller
   - add API for SDR devices.  Drivers are still on staging
   - some API improvements for getting EDID data from media
     inputs/outputs
   - new DVB frontend driver for drx-j (ATSC)
   - one driver (it913x/it9137) got removed, in favor of an improvement
     on another driver (af9035)
   - added a skeleton V4L2 PCI driver at documentation
   - added a dual flash driver (lm3646)
   - added a new IR driver (img-ir)
   - added an IR scancode decoder for the Sharp protocol
   - some improvements at the usbtv driver, to allow its core to be
     reused.
   - added a new SDR driver (rtl2832u_sdr)
   - added a new tuner driver (msi001)
   - several improvements at em28xx driver to fix PM support, device
     removal and to split the V4L2 specific bits into a separate
     sub-driver
   - one driver got converted to videobuf2 (s2255drv)
   - the e4000 tuner driver now follows an improved binding model
   - some fixes at V4L2 compat32 code
   - several fixes and enhancements at videobuf2 code
   - some cleanups at V4L2 API documentation
   - usual driver enhancements, new board additions and misc fixups"

[ NOTE! This merge effective drops commit 4329b93b283c ("of: Reduce
  indentation in of_graph_get_next_endpoint").

  The of_graph_get_next_endpoint() function was moved and renamed by
  commit fd9fdb78a9bf ("[media] of: move graph helpers from
  drivers/media/v4l2-core to drivers/of").  It was originally called
  v4l2_of_get_next_endpoint() and lived in the file
  drivers/media/v4l2-core/v4l2-of.c.

  In that original location, it was then fixed to support empty port
  nodes by commit b9db140c1e46 ("[media] v4l: of: Support empty port
  nodes"), and that commit clashes badly with the dropped "Reduce
  intendation" commit.  I had to choose one or the other, and decided
  that the "Support empty port nodes" commit was more important ]

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (426 commits)
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  Revert "[media] em28xx-dvb: fix PCTV 461e tuner I2C binding"
  [media] em28xx: fix PCTV 290e LNA oops
  [media] em28xx-dvb: fix PCTV 461e tuner I2C binding
  [media] m88ds3103: fix bug on .set_tone()
  [media] saa7134: fix WARN_ON during resume
  [media] v4l2-dv-timings: add module name, description, license
  [media] videodev2.h: add parenthesis around macro arguments
  [media] saa6752hs: depends on CRC32
  [media] si4713: fix Kconfig dependencies
  [media] Sensoray 2255 uses videobuf2
  [media] adv7180: free an interrupt on failure paths in init_device()
  [media] e4000: make VIDEO_V4L2 dependency optional
  [media] af9033: Don't export functions for the hardware filter
  [media] af9035: use af9033 PID filters
  [media] af9033: implement PID filter
  [media] rtl2832_sdr: do not use dynamic stack allocation
  [media] e4000: fix 32-bit build error
  [media] em28xx-audio: make sure audio is unmuted on open()
  [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
  ...

8 files changed, 276 insertions, 39 deletions

diff --git a/include/media/adv7842.h b/include/media/adv7842.h
index 39322091e8b0..924cbb8d004a 100644
--- a/include/media/adv7842.h
+++ b/include/media/adv7842.h
@@ -220,6 +220,9 @@ struct adv7842_platform_data {
         unsigned sdp_free_run_cbar_en:1;
         unsigned sdp_free_run_force:1;
 
+        /* HPA manual (0) or auto (1), affects HDMI register 0x69 */
+        unsigned hpa_auto:1;
+
         struct adv7842_sdp_csc_coeff sdp_csc_coeff;
 
         struct adv7842_sdp_io_sync_adjustment sdp_io_sync_625;
diff --git a/include/media/lm3646.h b/include/media/lm3646.h
new file mode 100644
index 000000000000..c6acf5a1d640
--- /dev/null
+++ b/include/media/lm3646.h
@@ -0,0 +1,87 @@
+/*
+ * include/media/lm3646.h
+ *
+ * Copyright (C) 2014 Texas Instruments
+ *
+ * Contact: Daniel Jeong <gshark.jeong@gmail.com>
+ *                      Ldd-Mlp <ldd-mlp@list.ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+
+#ifndef __LM3646_H__
+#define __LM3646_H__
+
+#include <media/v4l2-subdev.h>
+
+#define LM3646_NAME     "lm3646"
+#define LM3646_I2C_ADDR_REV1    (0x67)
+#define LM3646_I2C_ADDR_REV0    (0x63)
+
+/*  TOTAL FLASH Brightness Max
+ *      min 93350uA, step 93750uA, max 1499600uA
+ */
+#define LM3646_TOTAL_FLASH_BRT_MIN 93350
+#define LM3646_TOTAL_FLASH_BRT_STEP 93750
+#define LM3646_TOTAL_FLASH_BRT_MAX 1499600
+#define LM3646_TOTAL_FLASH_BRT_uA_TO_REG(a)     \
+        ((a) < LM3646_TOTAL_FLASH_BRT_MIN ? 0 : \
+         ((((a) - LM3646_TOTAL_FLASH_BRT_MIN) / LM3646_TOTAL_FLASH_BRT_STEP)))
+
+/*  TOTAL TORCH Brightness Max
+ *      min 23040uA, step 23430uA, max 187100uA
+ */
+#define LM3646_TOTAL_TORCH_BRT_MIN 23040
+#define LM3646_TOTAL_TORCH_BRT_STEP 23430
+#define LM3646_TOTAL_TORCH_BRT_MAX 187100
+#define LM3646_TOTAL_TORCH_BRT_uA_TO_REG(a)     \
+        ((a) < LM3646_TOTAL_TORCH_BRT_MIN ? 0 : \
+         ((((a) - LM3646_TOTAL_TORCH_BRT_MIN) / LM3646_TOTAL_TORCH_BRT_STEP)))
+
+/*  LED1 FLASH Brightness
+ *      min 23040uA, step 11718uA, max 1499600uA
+ */
+#define LM3646_LED1_FLASH_BRT_MIN 23040
+#define LM3646_LED1_FLASH_BRT_STEP 11718
+#define LM3646_LED1_FLASH_BRT_MAX 1499600
+#define LM3646_LED1_FLASH_BRT_uA_TO_REG(a)      \
+        ((a) <= LM3646_LED1_FLASH_BRT_MIN ? 0 : \
+         ((((a) - LM3646_LED1_FLASH_BRT_MIN) / LM3646_LED1_FLASH_BRT_STEP))+1)
+
+/*  LED1 TORCH Brightness
+ *      min 2530uA, step 1460uA, max 187100uA
+ */
+#define LM3646_LED1_TORCH_BRT_MIN 2530
+#define LM3646_LED1_TORCH_BRT_STEP 1460
+#define LM3646_LED1_TORCH_BRT_MAX 187100
+#define LM3646_LED1_TORCH_BRT_uA_TO_REG(a)      \
+        ((a) <= LM3646_LED1_TORCH_BRT_MIN ? 0 : \
+         ((((a) - LM3646_LED1_TORCH_BRT_MIN) / LM3646_LED1_TORCH_BRT_STEP))+1)
+
+/*  FLASH TIMEOUT DURATION
+ *      min 50ms, step 50ms, max 400ms
+ */
+#define LM3646_FLASH_TOUT_MIN 50
+#define LM3646_FLASH_TOUT_STEP 50
+#define LM3646_FLASH_TOUT_MAX 400
+#define LM3646_FLASH_TOUT_ms_TO_REG(a)  \
+        ((a) <= LM3646_FLASH_TOUT_MIN ? 0 :     \
+         (((a) - LM3646_FLASH_TOUT_MIN) / LM3646_FLASH_TOUT_STEP))
+
+/* struct lm3646_platform_data
+ *
+ * @flash_timeout: flash timeout
+ * @led1_flash_brt: led1 flash mode brightness, uA
+ * @led1_torch_brt: led1 torch mode brightness, uA
+ */
+struct lm3646_platform_data {
+
+        u32 flash_timeout;
+
+        u32 led1_flash_brt;
+        u32 led1_torch_brt;
+};
+
+#endif /* __LM3646_H__ */
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 2f6f1f78d958..0b9f890ce431 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -1,7 +1,7 @@
 /*
  * Remote Controller core header
  *
- * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * Copyright (C) 2009-2010 by Mauro Carvalho Chehab
  *
  * This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,6 +35,29 @@ enum rc_driver_type {
 };
 
 /**
+ * struct rc_scancode_filter - Filter scan codes.
+ * @data:       Scancode data to match.
+ * @mask:       Mask of bits of scancode to compare.
+ */
+struct rc_scancode_filter {
+        u32 data;
+        u32 mask;
+};
+
+/**
+ * enum rc_filter_type - Filter type constants.
+ * @RC_FILTER_NORMAL:   Filter for normal operation.
+ * @RC_FILTER_WAKEUP:   Filter for waking from suspend.
+ * @RC_FILTER_MAX:      Number of filter types.
+ */
+enum rc_filter_type {
+        RC_FILTER_NORMAL = 0,
+        RC_FILTER_WAKEUP,
+
+        RC_FILTER_MAX
+};
+
+/**
  * struct rc_dev - represents a remote control device
  * @dev: driver model's view of this device
  * @input_name: name of the input child device
@@ -50,8 +73,10 @@ enum rc_driver_type {
  * @input_dev: the input child device used to communicate events to userspace
  * @driver_type: specifies if protocol decoding is done in hardware or software
  * @idle: used to keep track of RX state
- * @allowed_protos: bitmask with the supported RC_BIT_* protocols
- * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols
+ * @allowed_protocols: bitmask with the supported RC_BIT_* protocols for each
+ *      filter type
+ * @enabled_protocols: bitmask with the enabled RC_BIT_* protocols for each
+ *      filter type
  * @scanmask: some hardware decoders are not capable of providing the full
  *      scancode to the application. As this is a hardware limit, we can't do
  *      anything with it. Yet, as the same keycode table can be used with other
@@ -70,7 +95,10 @@ enum rc_driver_type {
  * @max_timeout: maximum timeout supported by device
  * @rx_resolution : resolution (in ns) of input sampler
  * @tx_resolution: resolution (in ns) of output sampler
+ * @scancode_filters: scancode filters (indexed by enum rc_filter_type)
  * @change_protocol: allow changing the protocol used on hardware decoders
+ * @change_wakeup_protocol: allow changing the protocol used for wakeup
+ *      filtering
  * @open: callback to allow drivers to enable polling/irq when IR input device
  *      is opened.
  * @close: callback to allow drivers to disable polling/irq when IR input device
@@ -84,6 +112,7 @@ enum rc_driver_type {
  *      device doesn't interrupt host until it sees IR pulses
  * @s_learning_mode: enable wide band receiver used for learning
  * @s_carrier_report: enable carrier reports
+ * @s_filter: set the scancode filter of a given type
  */
 struct rc_dev {
         struct device                   dev;
@@ -99,8 +128,8 @@ struct rc_dev {
         struct input_dev                *input_dev;
         enum rc_driver_type             driver_type;
         bool                            idle;
-        u64                             allowed_protos;
-        u64                             enabled_protocols;
+        u64                             allowed_protocols[RC_FILTER_MAX];
+        u64                             enabled_protocols[RC_FILTER_MAX];
         u32                             users;
         u32                             scanmask;
         void                            *priv;
@@ -116,7 +145,9 @@ struct rc_dev {
         u32                             max_timeout;
         u32                             rx_resolution;
         u32                             tx_resolution;
+        struct rc_scancode_filter       scancode_filters[RC_FILTER_MAX];
         int                             (*change_protocol)(struct rc_dev *dev, u64 *rc_type);
+        int                             (*change_wakeup_protocol)(struct rc_dev *dev, u64 *rc_type);
         int                             (*open)(struct rc_dev *dev);
         void                            (*close)(struct rc_dev *dev);
         int                             (*s_tx_mask)(struct rc_dev *dev, u32 mask);
@@ -127,10 +158,49 @@ struct rc_dev {
         void                            (*s_idle)(struct rc_dev *dev, bool enable);
         int                             (*s_learning_mode)(struct rc_dev *dev, int enable);
         int                             (*s_carrier_report) (struct rc_dev *dev, int enable);
+        int                             (*s_filter)(struct rc_dev *dev,
+                                                    enum rc_filter_type type,
+                                                    struct rc_scancode_filter *filter);
 };
 
 #define to_rc_dev(d) container_of(d, struct rc_dev, dev)
 
+static inline bool rc_protocols_allowed(struct rc_dev *rdev, u64 protos)
+{
+        return rdev->allowed_protocols[RC_FILTER_NORMAL] & protos;
+}
+
+/* should be called prior to registration or with mutex held */
+static inline void rc_set_allowed_protocols(struct rc_dev *rdev, u64 protos)
+{
+        rdev->allowed_protocols[RC_FILTER_NORMAL] = protos;
+}
+
+static inline bool rc_protocols_enabled(struct rc_dev *rdev, u64 protos)
+{
+        return rdev->enabled_protocols[RC_FILTER_NORMAL] & protos;
+}
+
+/* should be called prior to registration or with mutex held */
+static inline void rc_set_enabled_protocols(struct rc_dev *rdev, u64 protos)
+{
+        rdev->enabled_protocols[RC_FILTER_NORMAL] = protos;
+}
+
+/* should be called prior to registration or with mutex held */
+static inline void rc_set_allowed_wakeup_protocols(struct rc_dev *rdev,
+                                                   u64 protos)
+{
+        rdev->allowed_protocols[RC_FILTER_WAKEUP] = protos;
+}
+
+/* should be called prior to registration or with mutex held */
+static inline void rc_set_enabled_wakeup_protocols(struct rc_dev *rdev,
+                                                   u64 protos)
+{
+        rdev->enabled_protocols[RC_FILTER_WAKEUP] = protos;
+}
+
 /*
  * From rc-main.c
  * Those functions can be used on any type of Remote Controller. They
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index a20ed97d7d8a..e5aa2409c0ea 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -1,7 +1,7 @@
 /*
  * rc-map.h - define RC map names used by RC drivers
  *
- * Copyright (c) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
+ * Copyright (c) 2010 by Mauro Carvalho Chehab
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@ enum rc_type {
         RC_TYPE_RC6_6A_24       = 15,   /* Philips RC6-6A-24 protocol */
         RC_TYPE_RC6_6A_32       = 16,   /* Philips RC6-6A-32 protocol */
         RC_TYPE_RC6_MCE         = 17,   /* MCE (Philips RC6-6A-32 subtype) protocol */
+        RC_TYPE_SHARP           = 18,   /* Sharp protocol */
 };
 
 #define RC_BIT_NONE             0
@@ -51,6 +52,7 @@ enum rc_type {
 #define RC_BIT_RC6_6A_24        (1 << RC_TYPE_RC6_6A_24)
 #define RC_BIT_RC6_6A_32        (1 << RC_TYPE_RC6_6A_32)
 #define RC_BIT_RC6_MCE          (1 << RC_TYPE_RC6_MCE)
+#define RC_BIT_SHARP            (1 << RC_TYPE_SHARP)
 
 #define RC_BIT_ALL      (RC_BIT_UNKNOWN | RC_BIT_OTHER | RC_BIT_LIRC | \
                          RC_BIT_RC5 | RC_BIT_RC5X | RC_BIT_RC5_SZ | \
@@ -58,7 +60,7 @@ enum rc_type {
                          RC_BIT_SONY12 | RC_BIT_SONY15 | RC_BIT_SONY20 | \
                          RC_BIT_NEC | RC_BIT_SANYO | RC_BIT_MCE_KBD | \
                          RC_BIT_RC6_0 | RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | \
-                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE)
+                         RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE | RC_BIT_SHARP)
 
 struct rc_map_table {
         u32     scancode;
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index c768c9f8abc2..eec6e460f649 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -24,7 +24,8 @@
 #define VFL_TYPE_VBI            1
 #define VFL_TYPE_RADIO          2
 #define VFL_TYPE_SUBDEV         3
-#define VFL_TYPE_MAX            4
+#define VFL_TYPE_SDR            4
+#define VFL_TYPE_MAX            5
 
 /* Is this a receiver, transmitter or mem-to-mem? */
 /* Ignored for VFL_TYPE_SUBDEV. */
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index e0b74a430b3a..50cf7c110a70 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -40,6 +40,8 @@ struct v4l2_ioctl_ops {
                                               struct v4l2_fmtdesc *f);
         int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
                                               struct v4l2_fmtdesc *f);
+        int (*vidioc_enum_fmt_sdr_cap)     (struct file *file, void *fh,
+                                            struct v4l2_fmtdesc *f);
 
         /* VIDIOC_G_FMT handlers */
         int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
@@ -62,6 +64,8 @@ struct v4l2_ioctl_ops {
                                            struct v4l2_format *f);
         int (*vidioc_g_fmt_vid_out_mplane)(struct file *file, void *fh,
                                            struct v4l2_format *f);
+        int (*vidioc_g_fmt_sdr_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
 
         /* VIDIOC_S_FMT handlers */
         int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
@@ -84,6 +88,8 @@ struct v4l2_ioctl_ops {
                                            struct v4l2_format *f);
         int (*vidioc_s_fmt_vid_out_mplane)(struct file *file, void *fh,
                                            struct v4l2_format *f);
+        int (*vidioc_s_fmt_sdr_cap)    (struct file *file, void *fh,
+                                        struct v4l2_format *f);
 
         /* VIDIOC_TRY_FMT handlers */
         int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
@@ -106,6 +112,8 @@ struct v4l2_ioctl_ops {
                                              struct v4l2_format *f);
         int (*vidioc_try_fmt_vid_out_mplane)(struct file *file, void *fh,
                                              struct v4l2_format *f);
+        int (*vidioc_try_fmt_sdr_cap)    (struct file *file, void *fh,
+                                          struct v4l2_format *f);
 
         /* Buffer handlers */
         int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
@@ -265,6 +273,8 @@ struct v4l2_ioctl_ops {
                                     struct v4l2_enum_dv_timings *timings);
         int (*vidioc_dv_timings_cap) (struct file *file, void *fh,
                                     struct v4l2_dv_timings_cap *cap);
+        int (*vidioc_g_edid) (struct file *file, void *fh, struct v4l2_edid *edid);
+        int (*vidioc_s_edid) (struct file *file, void *fh, struct v4l2_edid *edid);
 
         int (*vidioc_subscribe_event)  (struct v4l2_fh *fh,
                                         const struct v4l2_event_subscription *sub);
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index d67210a37ef3..28f4d8c3cf7d 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -162,6 +162,10 @@ struct v4l2_subdev_core_ops {
         int (*g_std)(struct v4l2_subdev *sd, v4l2_std_id *norm);
         int (*s_std)(struct v4l2_subdev *sd, v4l2_std_id norm);
         long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
+#ifdef CONFIG_COMPAT
+        long (*compat_ioctl32)(struct v4l2_subdev *sd, unsigned int cmd,
+                               unsigned long arg);
+#endif
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         int (*g_register)(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg);
         int (*s_register)(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg);
@@ -192,6 +196,7 @@ struct v4l2_subdev_tuner_ops {
         int (*s_radio)(struct v4l2_subdev *sd);
         int (*s_frequency)(struct v4l2_subdev *sd, const struct v4l2_frequency *freq);
         int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
+        int (*enum_freq_bands)(struct v4l2_subdev *sd, struct v4l2_frequency_band *band);
         int (*g_tuner)(struct v4l2_subdev *sd, struct v4l2_tuner *vt);
         int (*s_tuner)(struct v4l2_subdev *sd, const struct v4l2_tuner *vt);
         int (*g_modulator)(struct v4l2_subdev *sd, struct v4l2_modulator *vm);
@@ -503,8 +508,8 @@ struct v4l2_subdev_pad_ops {
                              struct v4l2_subdev_selection *sel);
         int (*set_selection)(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
                              struct v4l2_subdev_selection *sel);
-        int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid);
-        int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_subdev_edid *edid);
+        int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
+        int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
 #ifdef CONFIG_MEDIA_CONTROLLER
         int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link,
                              struct v4l2_subdev_format *source_fmt,
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index bef53ce555d2..af4621109726 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -34,49 +34,49 @@ struct vb2_fileio_data;
  *              usually will result in the allocator freeing the buffer (if
  *              no other users of this buffer are present); the buf_priv
  *              argument is the allocator private per-buffer structure
- *              previously returned from the alloc callback
+ *              previously returned from the alloc callback.
  * @get_userptr: acquire userspace memory for a hardware operation; used for
  *               USERPTR memory types; vaddr is the address passed to the
  *               videobuf layer when queuing a video buffer of USERPTR type;
  *               should return an allocator private per-buffer structure
  *               associated with the buffer on success, NULL on failure;
  *               the returned private structure will then be passed as buf_priv
- *               argument to other ops in this structure
+ *               argument to other ops in this structure.
  * @put_userptr: inform the allocator that a USERPTR buffer will no longer
- *               be used
+ *               be used.
  * @attach_dmabuf: attach a shared struct dma_buf for a hardware operation;
  *                 used for DMABUF memory types; alloc_ctx is the alloc context
  *                 dbuf is the shared dma_buf; returns NULL on failure;
  *                 allocator private per-buffer structure on success;
- *                 this needs to be used for further accesses to the buffer
+ *                 this needs to be used for further accesses to the buffer.
  * @detach_dmabuf: inform the exporter of the buffer that the current DMABUF
  *                 buffer is no longer used; the buf_priv argument is the
  *                 allocator private per-buffer structure previously returned
- *                 from the attach_dmabuf callback
+ *                 from the attach_dmabuf callback.
  * @map_dmabuf: request for access to the dmabuf from allocator; the allocator
  *              of dmabuf is informed that this driver is going to use the
- *              dmabuf
+ *              dmabuf.
  * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified
- *                that this driver is done using the dmabuf for now
+ *                that this driver is done using the dmabuf for now.
  * @prepare:    called every time the buffer is passed from userspace to the
- *              driver, useful for cache synchronisation, optional
+ *              driver, useful for cache synchronisation, optional.
  * @finish:     called every time the buffer is passed back from the driver
- *              to the userspace, also optional
+ *              to the userspace, also optional.
  * @vaddr:      return a kernel virtual address to a given memory buffer
  *              associated with the passed private structure or NULL if no
- *              such mapping exists
+ *              such mapping exists.
  * @cookie:     return allocator specific cookie for a given memory buffer
  *              associated with the passed private structure or NULL if not
- *              available
+ *              available.
  * @num_users:  return the current number of users of a memory buffer;
  *              return 1 if the videobuf layer (or actually the driver using
- *              it) is the only user
+ *              it) is the only user.
  * @mmap:       setup a userspace mapping for a given memory buffer under
- *              the provided virtual memory region
+ *              the provided virtual memory region.
  *
  * Required ops for USERPTR types: get_userptr, put_userptr.
  * Required ops for MMAP types: alloc, put, num_users, mmap.
- * Required ops for read/write access types: alloc, put, num_users, vaddr
+ * Required ops for read/write access types: alloc, put, num_users, vaddr.
  * Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf,
  *                                unmap_dmabuf.
  */
@@ -203,6 +203,37 @@ struct vb2_buffer {
         struct list_head        done_entry;
 
         struct vb2_plane        planes[VIDEO_MAX_PLANES];
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        /*
+         * Counters for how often these buffer-related ops are
+         * called. Used to check for unbalanced ops.
+         */
+        u32             cnt_mem_alloc;
+        u32             cnt_mem_put;
+        u32             cnt_mem_get_dmabuf;
+        u32             cnt_mem_get_userptr;
+        u32             cnt_mem_put_userptr;
+        u32             cnt_mem_prepare;
+        u32             cnt_mem_finish;
+        u32             cnt_mem_attach_dmabuf;
+        u32             cnt_mem_detach_dmabuf;
+        u32             cnt_mem_map_dmabuf;
+        u32             cnt_mem_unmap_dmabuf;
+        u32             cnt_mem_vaddr;
+        u32             cnt_mem_cookie;
+        u32             cnt_mem_num_users;
+        u32             cnt_mem_mmap;
+
+        u32             cnt_buf_init;
+        u32             cnt_buf_prepare;
+        u32             cnt_buf_finish;
+        u32             cnt_buf_cleanup;
+        u32             cnt_buf_queue;
+
+        /* This counts the number of calls to vb2_buffer_done() */
+        u32             cnt_buf_done;
+#endif
 };
 
 /**
@@ -227,27 +258,35 @@ struct vb2_buffer {
  * @wait_prepare:       release any locks taken while calling vb2 functions;
  *                      it is called before an ioctl needs to wait for a new
  *                      buffer to arrive; required to avoid a deadlock in
- *                      blocking access type
+ *                      blocking access type.
  * @wait_finish:        reacquire all locks released in the previous callback;
  *                      required to continue operation after sleeping while
- *                      waiting for a new buffer to arrive
+ *                      waiting for a new buffer to arrive.
  * @buf_init:           called once after allocating a buffer (in MMAP case)
  *                      or after acquiring a new USERPTR buffer; drivers may
  *                      perform additional buffer-related initialization;
  *                      initialization failure (return != 0) will prevent
- *                      queue setup from completing successfully; optional
+ *                      queue setup from completing successfully; optional.
  * @buf_prepare:        called every time the buffer is queued from userspace
  *                      and from the VIDIOC_PREPARE_BUF ioctl; drivers may
  *                      perform any initialization required before each hardware
  *                      operation in this callback; drivers that support
  *                      VIDIOC_CREATE_BUFS must also validate the buffer size;
  *                      if an error is returned, the buffer will not be queued
- *                      in driver; optional
+ *                      in driver; optional.
  * @buf_finish:         called before every dequeue of the buffer back to
  *                      userspace; drivers may perform any operations required
- *                      before userspace accesses the buffer; optional
+ *                      before userspace accesses the buffer; optional. The
+ *                      buffer state can be one of the following: DONE and
+ *                      ERROR occur while streaming is in progress, and the
+ *                      PREPARED state occurs when the queue has been canceled
+ *                      and all pending buffers are being returned to their
+ *                      default DEQUEUED state. Typically you only have to do
+ *                      something if the state is VB2_BUF_STATE_DONE, since in
+ *                      all other cases the buffer contents will be ignored
+ *                      anyway.
  * @buf_cleanup:        called once before the buffer is freed; drivers may
- *                      perform any additional cleanup; optional
+ *                      perform any additional cleanup; optional.
  * @start_streaming:    called once to enter 'streaming' state; the driver may
  *                      receive buffers with @buf_queue callback before
  *                      @start_streaming is called; the driver gets the number
@@ -268,7 +307,7 @@ struct vb2_buffer {
  *                      the buffer back by calling vb2_buffer_done() function;
  *                      it is allways called after calling STREAMON ioctl;
  *                      might be called before start_streaming callback if user
- *                      pre-queued buffers before calling STREAMON
+ *                      pre-queued buffers before calling STREAMON.
  */
 struct vb2_ops {
         int (*queue_setup)(struct vb2_queue *q, const struct v4l2_format *fmt,
@@ -280,7 +319,7 @@ struct vb2_ops {
 
         int (*buf_init)(struct vb2_buffer *vb);
         int (*buf_prepare)(struct vb2_buffer *vb);
-        int (*buf_finish)(struct vb2_buffer *vb);
+        void (*buf_finish)(struct vb2_buffer *vb);
         void (*buf_cleanup)(struct vb2_buffer *vb);
 
         int (*start_streaming)(struct vb2_queue *q, unsigned int count);
@@ -312,23 +351,29 @@ struct v4l2_fh;
  * @buf_struct_size: size of the driver-specific buffer structure;
  *              "0" indicates the driver doesn't want to use a custom buffer
  *              structure type, so sizeof(struct vb2_buffer) will is used
+ * @timestamp_flags: Timestamp flags; V4L2_BUF_FLAGS_TIMESTAMP_* and
+ *              V4L2_BUF_FLAGS_TSTAMP_SRC_*
  * @gfp_flags:  additional gfp flags used when allocating the buffers.
  *              Typically this is 0, but it may be e.g. GFP_DMA or __GFP_DMA32
  *              to force the buffer allocation to a specific memory zone.
+ * @min_buffers_needed: the minimum number of buffers needed before
+ *              start_streaming() can be called. Used when a DMA engine
+ *              cannot be started unless at least this number of buffers
+ *              have been queued into the driver.
  *
  * @memory:     current memory type used
  * @bufs:       videobuf buffer structures
  * @num_buffers: number of allocated/used buffers
  * @queued_list: list of buffers currently queued from userspace
- * @queued_count: number of buffers owned by the driver
+ * @queued_count: number of buffers queued and ready for streaming.
+ * @owned_by_drv_count: number of buffers owned by the driver
  * @done_list:  list of buffers ready to be dequeued to userspace
  * @done_lock:  lock to protect done_list list
  * @done_wq:    waitqueue for processes waiting for buffers ready to be dequeued
  * @alloc_ctx:  memory type/allocator-specific contexts for each plane
  * @streaming:  current streaming state
- * @retry_start_streaming: start_streaming() was called, but there were not enough
- *              buffers queued. If set, then retry calling start_streaming when
- *              queuing a new buffer.
+ * @start_streaming_called: start_streaming() was called successfully and we
+ *              started streaming.
  * @fileio:     file io emulator internal data, used only if emulator is active
  */
 struct vb2_queue {
@@ -342,8 +387,9 @@ struct vb2_queue {
         const struct vb2_mem_ops        *mem_ops;
         void                            *drv_priv;
         unsigned int                    buf_struct_size;
-        u32                             timestamp_type;
+        u32                             timestamp_flags;
         gfp_t                           gfp_flags;
+        u32                             min_buffers_needed;
 
 /* private: internal use only */
         enum v4l2_memory                memory;
@@ -351,8 +397,9 @@ struct vb2_queue {
         unsigned int                    num_buffers;
 
         struct list_head                queued_list;
+        unsigned int                    queued_count;
 
-        atomic_t                        queued_count;
+        atomic_t                        owned_by_drv_count;
         struct list_head                done_list;
         spinlock_t                      done_lock;
         wait_queue_head_t               done_wq;
@@ -361,9 +408,21 @@ struct vb2_queue {
         unsigned int                    plane_sizes[VIDEO_MAX_PLANES];
 
         unsigned int                    streaming:1;
-        unsigned int                    retry_start_streaming:1;
+        unsigned int                    start_streaming_called:1;
 
         struct vb2_fileio_data          *fileio;
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+        /*
+         * Counters for how often these queue-related ops are
+         * called. Used to check for unbalanced ops.
+         */
+        u32                             cnt_queue_setup;
+        u32                             cnt_wait_prepare;
+        u32                             cnt_wait_finish;
+        u32                             cnt_start_streaming;
+        u32                             cnt_stop_streaming;
+#endif
 };
 
 void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no);