diff options
| author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2013-02-09 00:54:54 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-06-04 23:27:50 +0300 |
| commit | a2cc81d315c45cce35c0e50716fbee5dc00e28aa (patch) | |
| tree | 93442b547d47751b336d6b80d711a55536c076ef | |
| parent | 81fbf101f2858e63bbb380447a76870924b84653 (diff) | |
| download | op-kernel-dev-a2cc81d315c45cce35c0e50716fbee5dc00e28aa.zip op-kernel-dev-a2cc81d315c45cce35c0e50716fbee5dc00e28aa.tar.gz | |
usb: gadget: uvc: Implement videobuf2 .wait_prepare and .wait_finish operations
Those optional operations are used to release and reacquire the queue
lock when videobuf2 needs to perform operations that sleep for a long
time, such as waiting for a buffer to be complete. Implement them to
avoid blocking qbuf or streamoff calls when a dqbuf is in progress.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/uvc_queue.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/usb/gadget/uvc_queue.c b/drivers/usb/gadget/uvc_queue.c index 7ce27e3..e617047 100644 --- a/drivers/usb/gadget/uvc_queue.c +++ b/drivers/usb/gadget/uvc_queue.c @@ -103,10 +103,26 @@ static void uvc_buffer_queue(struct vb2_buffer *vb) spin_unlock_irqrestore(&queue->irqlock, flags); } +static void uvc_wait_prepare(struct vb2_queue *vq) +{ + struct uvc_video_queue *queue = vb2_get_drv_priv(vq); + + mutex_unlock(&queue->mutex); +} + +static void uvc_wait_finish(struct vb2_queue *vq) +{ + struct uvc_video_queue *queue = vb2_get_drv_priv(vq); + + mutex_lock(&queue->mutex); +} + static struct vb2_ops uvc_queue_qops = { .queue_setup = uvc_queue_setup, .buf_prepare = uvc_buffer_prepare, .buf_queue = uvc_buffer_queue, + .wait_prepare = uvc_wait_prepare, + .wait_finish = uvc_wait_finish, }; static int uvc_queue_init(struct uvc_video_queue *queue, |
