summaryrefslogtreecommitdiff
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-06-22 07:29:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 17:30:54 -0300
commit5a5adf6b669cf1a3dd2af419cd68a4c491f384a3 (patch)
tree42b1c4709c3c5cca04fb15bd369e6ae4921645d4 /include/media/v4l2-dev.h
parent5d44f5e3e388739f017a74e73dab2a995673915f (diff)
downloadlwn-5a5adf6b669cf1a3dd2af419cd68a4c491f384a3.tar.gz
lwn-5a5adf6b669cf1a3dd2af419cd68a4c491f384a3.zip
[media] v4l2-dev/ioctl.c: add vb2_queue support to video_device
This prepares struct video_device for easier integration with vb2. It also introduces a new lock that protects the vb2_queue. It is up to the driver to use it or not. And the driver can associate an owner filehandle with the queue to check whether queuing requests are permitted for the calling filehandle. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index a056e6ee1b68..5c416cdc88d5 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -100,6 +100,9 @@ struct video_device
/* Control handler associated with this device node. May be NULL. */
struct v4l2_ctrl_handler *ctrl_handler;
+ /* vb2_queue associated with this device node. May be NULL. */
+ struct vb2_queue *queue;
+
/* Priority state. If NULL, then v4l2_dev->prio will be used. */
struct v4l2_prio_state *prio;