kernel/drivers/media/usb/uvc/uvc_queue.c, branch linux-4.3.y

[media] uvcvideo: Implement DMABUF exporter role

2015-05-30T15:11:40Z

Now that videobuf2-vmalloc supports exporting buffers, add support for the DMABUF exporter role by plugging in the videobuf2 ioctl helper. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Don't call vb2 mmap and get_unmapped_area with queue lock held

2015-04-02T20:29:28Z

videobuf2 has long been subject to AB-BA style deadlocks due to the queue lock and mmap_sem being taken in different orders for the mmap and get_unmapped_area operations. The problem has been fixed by making those two operations callable without taking the queue lock, using an mmap_lock internal to videobuf2. The uvcvideo driver still calls the mmap and get_unmapped_area operations with the queue lock held, resulting in a potential deadlock. As the operations can now be called without locking the queue, fix it. Reported-by: Bjørn Mork Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] media: usb: uvc: use vb2_ops_wait_prepare/finish helper

2014-12-23T10:58:09Z

This patch drops driver specific wait_prepare() and wait_finish() callbacks from vb2_ops and instead uses the the helpers vb2_ops_wait_prepare/finish() provided by the vb2 core, the lock member of the queue needs to be initalized to a mutex so that vb2 helpers vb2_ops_wait_prepare/finish() can make use of it. Signed-off-by: Lad, Prabhakar Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Return all buffers to vb2 at stream stop and start failure

2014-11-25T10:42:33Z

videobuf2 requires drivers to give back ownership of all queue buffers in the stop_streaming operation, as well as in the start_streaming operation in case of failure. Mark all queued buffers as done in the error or queued state. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Rename and split uvc_queue_enable to uvc_queue_stream(on|off)

2014-11-25T10:42:01Z

This brings the function name in line with the V4L2 API terminology and allows removing the duplicate queue type check. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Rename uvc_alloc_buffers to uvc_request_buffers

2014-11-25T10:41:05Z

This brings the function name in line with the V4L2 API terminology. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Don't stop the stream twice at file handle release

2014-11-25T10:40:37Z

When releasing the file handle the driver calls the vb2_queue_release which turns the stream off. There's thus no need to turn the stream off explicitly beforehand. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Implement vb2 queue start and stop stream operations

2014-11-25T10:40:08Z

To work propertly the videobuf2 core code needs to be in charge of stream start/stop control. Implement the start_streaming and stop_streaming vb2 operations and move video enable/disable code to them. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] uvcvideo: Add function to convert from queue to stream

2014-11-25T10:39:34Z

Factorize the container_of() call into an inline function and update callers. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab

[media] vb2: call buf_finish from __queue_cancel

2014-03-11T09:56:39Z

If a queue was canceled, then the buf_finish op was never called for the pending buffers. So add this call to queue_cancel. Before calling buf_finish set the buffer state to PREPARED, which is the correct state. That way the states DONE and ERROR will only be seen in buf_finish if streaming is in progress. Since buf_finish can now be called from non-streaming state we need to adapt the handful of drivers that actually need to know this. Signed-off-by: Hans Verkuil Acked-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab