[media] v4l: Add DMABUF as a memory type (051c7788) · Commits · e / devices / android_kernel_teracube_emerald

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -297,6 +297,7 @@ struct v4l2_plane32 {
	union {		union {
	__u32 mem_offset;		__u32 mem_offset;
	compat_long_t userptr;		compat_long_t userptr;
			__s32 fd;
	} m;		} m;
	__u32 data_offset;		__u32 data_offset;
	__u32 reserved[11];		__u32 reserved[11];
	@@ -318,6 +319,7 @@ struct v4l2_buffer32 {
	__u32 offset;		__u32 offset;
	compat_long_t userptr;		compat_long_t userptr;
	compat_caddr_t planes;		compat_caddr_t planes;
			__s32 fd;
	} m;		} m;
	__u32 length;		__u32 length;
	__u32 reserved2;		__u32 reserved2;
	@@ -341,6 +343,9 @@ static int get_v4l2_plane32(struct v4l2_plane up, struct v4l2_plane32 up32,
	up_pln = compat_ptr(p);		up_pln = compat_ptr(p);
	if (put_user((unsigned long)up_pln, &up->m.userptr))		if (put_user((unsigned long)up_pln, &up->m.userptr))
	return -EFAULT;		return -EFAULT;
			} else if (memory == V4L2_MEMORY_DMABUF) {
			if (copy_in_user(&up->m.fd, &up32->m.fd, sizeof(int)))
			return -EFAULT;
	} else {		} else {
	if (copy_in_user(&up->m.mem_offset, &up32->m.mem_offset,		if (copy_in_user(&up->m.mem_offset, &up32->m.mem_offset,
	sizeof(__u32)))		sizeof(__u32)))
	@@ -364,6 +369,11 @@ static int put_v4l2_plane32(struct v4l2_plane up, struct v4l2_plane32 up32,
	if (copy_in_user(&up32->m.mem_offset, &up->m.mem_offset,		if (copy_in_user(&up32->m.mem_offset, &up->m.mem_offset,
	sizeof(__u32)))		sizeof(__u32)))
	return -EFAULT;		return -EFAULT;
			/* For DMABUF, driver might've set up the fd, so copy it back. */
			if (memory == V4L2_MEMORY_DMABUF)
			if (copy_in_user(&up32->m.fd, &up->m.fd,
			sizeof(int)))
			return -EFAULT;

	return 0;		return 0;
	}		}
	@@ -446,6 +456,10 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
	if (get_user(kp->m.offset, &up->m.offset))		if (get_user(kp->m.offset, &up->m.offset))
	return -EFAULT;		return -EFAULT;
	break;		break;
			case V4L2_MEMORY_DMABUF:
			if (get_user(kp->m.fd, &up->m.fd))
			return -EFAULT;
			break;
	}		}
	}		}

	@@ -510,6 +524,10 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
	if (put_user(kp->m.offset, &up->m.offset))		if (put_user(kp->m.offset, &up->m.offset))
	return -EFAULT;		return -EFAULT;
	break;		break;
			case V4L2_MEMORY_DMABUF:
			if (put_user(kp->m.fd, &up->m.fd))
			return -EFAULT;
			break;
	}		}
	}		}

drivers/media/v4l2-core/v4l2-ioctl.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,6 +155,7 @@ static const char *v4l2_memory_names[] = {
	[V4L2_MEMORY_MMAP] = "mmap",		[V4L2_MEMORY_MMAP] = "mmap",
	[V4L2_MEMORY_USERPTR] = "userptr",		[V4L2_MEMORY_USERPTR] = "userptr",
	[V4L2_MEMORY_OVERLAY] = "overlay",		[V4L2_MEMORY_OVERLAY] = "overlay",
			[V4L2_MEMORY_DMABUF] = "dmabuf",
	};		};

	#define prt_names(a, arr) (((unsigned)(a)) < ARRAY_SIZE(arr) ? arr[a] : "unknown")		#define prt_names(a, arr) (((unsigned)(a)) < ARRAY_SIZE(arr) ? arr[a] : "unknown")

include/uapi/linux/videodev2.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -186,6 +186,7 @@ enum v4l2_memory {
	V4L2_MEMORY_MMAP = 1,		V4L2_MEMORY_MMAP = 1,
	V4L2_MEMORY_USERPTR = 2,		V4L2_MEMORY_USERPTR = 2,
	V4L2_MEMORY_OVERLAY = 3,		V4L2_MEMORY_OVERLAY = 3,
			V4L2_MEMORY_DMABUF = 4,
	};		};

	/* see also http://vektor.theorem.ca/graphics/ycbcr/ */		/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
	@@ -602,6 +603,8 @@ struct v4l2_requestbuffers {
	* should be passed to mmap() called on the video node)		* should be passed to mmap() called on the video node)
	* @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer		* @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer
	* pointing to this plane		* pointing to this plane
			* @fd: when memory is V4L2_MEMORY_DMABUF, a userspace file
			* descriptor associated with this plane
	* @data_offset: offset in the plane to the start of data; usually 0,		* @data_offset: offset in the plane to the start of data; usually 0,
	* unless there is a header in front of the data		* unless there is a header in front of the data
	*		*
	@@ -616,6 +619,7 @@ struct v4l2_plane {
	union {		union {
	__u32 mem_offset;		__u32 mem_offset;
	unsigned long userptr;		unsigned long userptr;
			__s32 fd;
	} m;		} m;
	__u32 data_offset;		__u32 data_offset;
	__u32 reserved[11];		__u32 reserved[11];
	@@ -640,6 +644,8 @@ struct v4l2_plane {
	* (or a "cookie" that should be passed to mmap() as offset)		* (or a "cookie" that should be passed to mmap() as offset)
	* @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;		* @userptr: for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
	* a userspace pointer pointing to this buffer		* a userspace pointer pointing to this buffer
			* @fd: for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF;
			* a userspace file descriptor associated with this buffer
	* @planes: for multiplanar buffers; userspace pointer to the array of plane		* @planes: for multiplanar buffers; userspace pointer to the array of plane
	* info structs for this buffer		* info structs for this buffer
	* @length: size in bytes of the buffer (NOT its payload) for single-plane		* @length: size in bytes of the buffer (NOT its payload) for single-plane
	@@ -666,6 +672,7 @@ struct v4l2_buffer {
	__u32 offset;		__u32 offset;
	unsigned long userptr;		unsigned long userptr;
	struct v4l2_plane *planes;		struct v4l2_plane *planes;
			__s32 fd;
	} m;		} m;
	__u32 length;		__u32 length;
	__u32 reserved2;		__u32 reserved2;