samsung update 1

1 files changed, 50 insertions, 0 deletions

diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index f87472a..dcfcdd1 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -16,6 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/poll.h>
 #include <linux/videodev2.h>
+#include <linux/dma-buf.h>
 
 struct vb2_alloc_ctx;
 struct vb2_fileio_data;
@@ -41,21 +42,48 @@ struct vb2_fileio_data;
  *		 argument to other ops in this structure
  * @put_userptr: inform the allocator that a USERPTR buffer will no longer
  *		 be used
+ * @attach_dmabuf: attach a shared struct dma_buf for a hardware operation;
+ *		used for DMABUF memory types; alloc_ctx is the alloc context
+ *		dbuf is the shared dma_buf; returns NULL on failure;
+ *		allocator private per-buffer structure on success;
+ *		this needs to be used for further accesses to the buffer.
+ * @detach_dmabuf: inform the exporter of the buffer that the current DMABUF
+ *		buffer is no longer used; the buf_priv argument is the
+ *		allocator private per-buffers structure previously returned
+ *		from the attach_dmabuf callback.
+ * @map_dmabuf: request for access to the dmabuf from allocator; the allocator
+ *		of dmabuf is informed that this driver is going to use the
+ *		dmabuf.
+ * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified
+ *		that this driver is done using the dmabuf for now.
+ * @export_dmabuf: export an allocated buffer to the dmabuf for that user can
+ *		access the buffer through the fd of it.
  * @vaddr:	return a kernel virtual address to a given memory buffer
  *		associated with the passed private structure or NULL if no
  *		such mapping exists
  * @cookie:	return allocator specific cookie for a given memory buffer
  *		associated with the passed private structure or NULL if not
  *		available
+ * @share:	return allocator specific object to share a given memory buffer
+ *		associated with the passed private structure or NULL if not
+ *		available
  * @num_users:	return the current number of users of a memory buffer;
  *		return 1 if the videobuf layer (or actually the driver using
  *		it) is the only user
  * @mmap:	setup a userspace mapping for a given memory buffer under
  *		the provided virtual memory region
+ * @sync_to_dev: change the ownership of the buffer from CPU to device; this
+ *               ensures that all stuffs related to the buffer visible to CPU
+ *		 are also visible to the device.
+ * @sync_from_dev: change the ownership of the buffer from device to CPU; this
+ *                 ensures that all stuffs related to the buffer visible to
+ *                 the device are also visible to the CPU.
  *
  * Required ops for USERPTR types: get_userptr, put_userptr.
  * Required ops for MMAP types: alloc, put, num_users, mmap.
  * Required ops for read/write access types: alloc, put, num_users, vaddr
+ * Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf,
+ *				  unmap_dmabuf, export_dmabuf.
  */
 struct vb2_mem_ops {
 	void		*(*alloc)(void *alloc_ctx, unsigned long size);
@@ -65,16 +93,36 @@ struct vb2_mem_ops {
 					unsigned long size, int write);
 	void		(*put_userptr)(void *buf_priv);
 
+	int		(*export_dmabuf)(void *alloc_ctx, void *buf_priv,
+						int *export_fd);
+
+	/*
+	 * XXX really, I think the attach/detach could be handled in the
+	 * vb2 core, and vb2_mem_ops really just need to get/put the sglist
+	 * (and make sure that the sglist fits it's needs..)
+	 */
+	void		*(*attach_dmabuf)(void *alloc_ctx,
+						struct dma_buf *dbuf);
+	void		(*detach_dmabuf)(void *buf_priv);
+	void		(*map_dmabuf)(void *buf_priv);
+	void		(*unmap_dmabuf)(void *buf_priv);
+
 	void		*(*vaddr)(void *buf_priv);
 	void		*(*cookie)(void *buf_priv);
+	void		*(*share)(void *buf_priv);
 
 	unsigned int	(*num_users)(void *buf_priv);
 
 	int		(*mmap)(void *buf_priv, struct vm_area_struct *vma);
+	void		(*sync_to_dev)(void *alloc_ctx[], void *privs[],
+					int nplanes, enum v4l2_buf_type type);
+	void		(*sync_from_dev)(void *alloc_ctx[], void *privs[],
+					int nplanes, enum v4l2_buf_type type);
 };
 
 struct vb2_plane {
 	void			*mem_priv;
+	struct dma_buf		*dbuf;
 	int			mapped:1;
 };
 
@@ -84,12 +132,14 @@ struct vb2_plane {
  * @VB2_USERPTR:	driver supports USERPTR with streaming API
  * @VB2_READ:		driver supports read() style access
  * @VB2_WRITE:		driver supports write() style access
+ * @VB2_DMABUF:		driver supports DMABUF with streaming API
  */
 enum vb2_io_modes {
 	VB2_MMAP	= (1 << 0),
 	VB2_USERPTR	= (1 << 1),
 	VB2_READ	= (1 << 2),
 	VB2_WRITE	= (1 << 3),
+	VB2_DMABUF	= (1 << 4),
 };
 
 /**