diff options
Diffstat (limited to 'patches/collateral-evolutions/media/0002-no_dmabuf')
-rw-r--r-- | patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index a535c2d3..218dc25f 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -117,7 +117,7 @@ /* * Place the busy tests at the end: -EBUSY can be ignored when -@@ -1421,6 +1429,7 @@ err: +@@ -1445,6 +1453,7 @@ err: return ret; } @@ -125,7 +125,7 @@ /** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ -@@ -1538,6 +1547,7 @@ err: +@@ -1562,6 +1571,7 @@ err: return ret; } @@ -133,7 +133,7 @@ /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing -@@ -1613,9 +1623,11 @@ static int __buf_prepare(struct vb2_buff +@@ -1637,9 +1647,11 @@ static int __buf_prepare(struct vb2_buff up_read(mmap_sem); break; @@ -145,7 +145,7 @@ default: WARN(1, "Invalid queue type\n"); ret = -EINVAL; -@@ -1980,8 +1992,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe +@@ -2004,8 +2016,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe */ static void __vb2_dqbuf(struct vb2_buffer *vb) { @@ -156,7 +156,7 @@ /* nothing to do if the buffer is already dequeued */ if (vb->state == VB2_BUF_STATE_DEQUEUED) -@@ -1989,6 +2003,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2013,6 +2027,7 @@ static void __vb2_dqbuf(struct vb2_buffe vb->state = VB2_BUF_STATE_DEQUEUED; @@ -164,7 +164,7 @@ /* unmap DMABUF buffer */ if (q->memory == V4L2_MEMORY_DMABUF) for (i = 0; i < vb->num_planes; ++i) { -@@ -1997,6 +2012,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2021,6 +2036,7 @@ static void __vb2_dqbuf(struct vb2_buffe call_void_memop(vb, unmap_dmabuf, vb->planes[i].mem_priv); vb->planes[i].dbuf_mapped = 0; } @@ -172,7 +172,7 @@ } static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) -@@ -2277,6 +2293,7 @@ static int __find_plane_by_offset(struct +@@ -2298,6 +2314,7 @@ static int __find_plane_by_offset(struct return -EINVAL; } @@ -180,7 +180,7 @@ /** * vb2_expbuf() - Export a buffer as a file descriptor * @q: videobuf2 queue -@@ -2354,6 +2371,7 @@ int vb2_expbuf(struct vb2_queue *q, stru +@@ -2375,6 +2392,7 @@ int vb2_expbuf(struct vb2_queue *q, stru return 0; } EXPORT_SYMBOL_GPL(vb2_expbuf); @@ -188,7 +188,7 @@ /** * vb2_mmap() - map video buffers into application address space -@@ -3269,6 +3287,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3290,6 +3308,7 @@ int vb2_ioctl_streamoff(struct file *fil } EXPORT_SYMBOL_GPL(vb2_ioctl_streamoff); @@ -196,7 +196,7 @@ int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p) { struct video_device *vdev = video_devdata(file); -@@ -3278,6 +3297,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3299,6 +3318,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -352,7 +352,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -445,7 +449,9 @@ int __must_check vb2_queue_init(struct v +@@ -446,7 +450,9 @@ int __must_check vb2_queue_init(struct v void vb2_queue_release(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); @@ -362,7 +362,7 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking); int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type); -@@ -601,8 +607,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -602,8 +608,10 @@ int vb2_ioctl_qbuf(struct file *file, vo int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p); int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i); int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i); |