1 files changed, 35 insertions, 15 deletions

diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index ea55c08eddfb..a15d1f1b319e 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -105,6 +105,7 @@ enum vb2_fileio_flags {
 /**
  * enum vb2_buffer_state - current video buffer state
  * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control
+ * @VB2_BUF_STATE_PREPARED:     buffer prepared in videobuf and by the driver
  * @VB2_BUF_STATE_QUEUED:       buffer queued in videobuf, but not in driver
  * @VB2_BUF_STATE_ACTIVE:       buffer queued in driver and possibly used
  *                              in a hardware operation
@@ -116,6 +117,7 @@ enum vb2_fileio_flags {
  */
 enum vb2_buffer_state {
         VB2_BUF_STATE_DEQUEUED,
+        VB2_BUF_STATE_PREPARED,
         VB2_BUF_STATE_QUEUED,
         VB2_BUF_STATE_ACTIVE,
         VB2_BUF_STATE_DONE,
@@ -167,13 +169,21 @@ struct vb2_buffer {
 /**
  * struct vb2_ops - driver-specific callbacks
  *
- * @queue_setup:        called from a VIDIOC_REQBUFS handler, before
- *                      memory allocation; driver should return the required
- *                      number of buffers in num_buffers, the required number
- *                      of planes per buffer in num_planes; the size of each
- *                      plane should be set in the sizes[] array and optional
- *                      per-plane allocator specific context in alloc_ctxs[]
- *                      array
+ * @queue_setup:        called from VIDIOC_REQBUFS and VIDIOC_CREATE_BUFS
+ *                      handlers before memory allocation, or, if
+ *                      *num_planes != 0, after the allocation to verify a
+ *                      smaller number of buffers. Driver should return
+ *                      the required number of buffers in *num_buffers, the
+ *                      required number of planes per buffer in *num_planes; the
+ *                      size of each plane should be set in the sizes[] array
+ *                      and optional per-plane allocator specific context in the
+ *                      alloc_ctxs[] array. When called from VIDIOC_REQBUFS,
+ *                      fmt == NULL, the driver has to use the currently
+ *                      configured format and *num_buffers is the total number
+ *                      of buffers, that are being allocated. When called from
+ *                      VIDIOC_CREATE_BUFS, fmt != NULL and it describes the
+ *                      target frame format. In this case *num_buffers are being
+ *                      allocated additionally to q->num_buffers.
  * @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
@@ -186,11 +196,11 @@ struct vb2_buffer {
  *                      perform additional buffer-related initialization;
  *                      initialization failure (return != 0) will prevent
  *                      queue setup from completing successfully; optional
- * @buf_prepare:        called every time the buffer is queued from userspace;
- *                      drivers may perform any initialization required before
- *                      each hardware operation in this callback;
- *                      if an error is returned, the buffer will not be queued
- *                      in driver; 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; if an error is returned, the
+ *                      buffer will not be queued 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
@@ -216,9 +226,9 @@ struct vb2_buffer {
  *                      pre-queued buffers before calling STREAMON
  */
 struct vb2_ops {
-        int (*queue_setup)(struct vb2_queue *q, unsigned int *num_buffers,
-                           unsigned int *num_planes, unsigned int sizes[],
-                           void *alloc_ctxs[]);
+        int (*queue_setup)(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[]);
 
         void (*wait_prepare)(struct vb2_queue *q);
         void (*wait_finish)(struct vb2_queue *q);
@@ -298,6 +308,9 @@ int vb2_wait_for_all_buffers(struct vb2_queue *q);
 int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b);
 int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
 
+int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
+int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
+
 int vb2_queue_init(struct vb2_queue *q);
 
 void vb2_queue_release(struct vb2_queue *q);
@@ -309,6 +322,13 @@ int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
 int vb2_streamoff(struct vb2_queue *q, enum v4l2_buf_type type);
 
 int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma);
+#ifndef CONFIG_MMU
+unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
+                                    unsigned long addr,
+                                    unsigned long len,
+                                    unsigned long pgoff,
+                                    unsigned long flags);
+#endif
 unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait);
 size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
                 loff_t *ppos, int nonblock);