forked from Minki/linux
d8e96c4bf6
Switch this driver over to the V4L2 core locking mechanism in preparation
for switching to unlocked_ioctl. Suggested by Laurent Pinchart.
This patch introduces a new mutex at the struct uvc_video level and
drops the old mutex at the queue level. The new lock is now used for all
ioctl locking and in the release file operation (the driver always has
to take care of locking in file operations, the core only serializes
ioctls).
Note that the mmap and get_unmapped_area file operations no longer take
a lock. Commit f035eb4e97 fixed a AB-BA
deadlock by moving all the locking down into vb2, so the mmap and
get_unmapped_area file operations should no longer do any locking before
calling into vb2.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
97 lines
2.4 KiB
C
97 lines
2.4 KiB
C
#ifndef _UVC_QUEUE_H_
|
|
#define _UVC_QUEUE_H_
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/poll.h>
|
|
#include <linux/videodev2.h>
|
|
#include <media/videobuf2-core.h>
|
|
|
|
/* Maximum frame size in bytes, for sanity checking. */
|
|
#define UVC_MAX_FRAME_SIZE (16*1024*1024)
|
|
/* Maximum number of video buffers. */
|
|
#define UVC_MAX_VIDEO_BUFFERS 32
|
|
|
|
/* ------------------------------------------------------------------------
|
|
* Structures.
|
|
*/
|
|
|
|
enum uvc_buffer_state {
|
|
UVC_BUF_STATE_IDLE = 0,
|
|
UVC_BUF_STATE_QUEUED = 1,
|
|
UVC_BUF_STATE_ACTIVE = 2,
|
|
UVC_BUF_STATE_DONE = 3,
|
|
UVC_BUF_STATE_ERROR = 4,
|
|
};
|
|
|
|
struct uvc_buffer {
|
|
struct vb2_buffer buf;
|
|
struct list_head queue;
|
|
|
|
enum uvc_buffer_state state;
|
|
void *mem;
|
|
unsigned int length;
|
|
unsigned int bytesused;
|
|
};
|
|
|
|
#define UVC_QUEUE_DISCONNECTED (1 << 0)
|
|
#define UVC_QUEUE_DROP_INCOMPLETE (1 << 1)
|
|
#define UVC_QUEUE_PAUSED (1 << 2)
|
|
|
|
struct uvc_video_queue {
|
|
struct vb2_queue queue;
|
|
|
|
unsigned int flags;
|
|
__u32 sequence;
|
|
|
|
unsigned int buf_used;
|
|
|
|
spinlock_t irqlock; /* Protects flags and irqqueue */
|
|
struct list_head irqqueue;
|
|
};
|
|
|
|
static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
|
|
{
|
|
return vb2_is_streaming(&queue->queue);
|
|
}
|
|
|
|
int uvcg_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
|
|
struct mutex *lock);
|
|
|
|
void uvcg_free_buffers(struct uvc_video_queue *queue);
|
|
|
|
int uvcg_alloc_buffers(struct uvc_video_queue *queue,
|
|
struct v4l2_requestbuffers *rb);
|
|
|
|
int uvcg_query_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf);
|
|
|
|
int uvcg_queue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf);
|
|
|
|
int uvcg_dequeue_buffer(struct uvc_video_queue *queue,
|
|
struct v4l2_buffer *buf, int nonblocking);
|
|
|
|
unsigned int uvcg_queue_poll(struct uvc_video_queue *queue,
|
|
struct file *file, poll_table *wait);
|
|
|
|
int uvcg_queue_mmap(struct uvc_video_queue *queue, struct vm_area_struct *vma);
|
|
|
|
#ifndef CONFIG_MMU
|
|
unsigned long uvcg_queue_get_unmapped_area(struct uvc_video_queue *queue,
|
|
unsigned long pgoff);
|
|
#endif /* CONFIG_MMU */
|
|
|
|
void uvcg_queue_cancel(struct uvc_video_queue *queue, int disconnect);
|
|
|
|
int uvcg_queue_enable(struct uvc_video_queue *queue, int enable);
|
|
|
|
struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
|
|
struct uvc_buffer *buf);
|
|
|
|
struct uvc_buffer *uvcg_queue_head(struct uvc_video_queue *queue);
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _UVC_QUEUE_H_ */
|
|
|