diff options
Diffstat (limited to 'patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch')
| -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 a6f4bf5e..f9ef90a2 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 -@@ -1443,6 +1451,7 @@ err: +@@ -1442,6 +1450,7 @@ err: return ret; } @@ -125,7 +125,7 @@ /** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ -@@ -1560,6 +1569,7 @@ err: +@@ -1559,6 +1568,7 @@ err: return ret; } @@ -133,7 +133,7 @@ /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing -@@ -1640,9 +1650,11 @@ static int __buf_prepare(struct vb2_buff +@@ -1639,9 +1649,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; -@@ -2015,8 +2027,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe +@@ -2027,8 +2039,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) -@@ -2024,6 +2038,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2036,6 +2050,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) { -@@ -2032,6 +2047,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2044,6 +2059,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) -@@ -2331,6 +2347,7 @@ static int __find_plane_by_offset(struct +@@ -2350,6 +2366,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 -@@ -2408,6 +2425,7 @@ int vb2_expbuf(struct vb2_queue *q, stru +@@ -2427,6 +2444,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 -@@ -3331,6 +3349,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3357,6 +3375,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); -@@ -3340,6 +3359,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3366,6 +3385,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -363,7 +363,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -453,7 +457,9 @@ void vb2_queue_release(struct vb2_queue +@@ -457,7 +461,9 @@ void vb2_queue_release(struct vb2_queue void vb2_queue_error(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); @@ -373,7 +373,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); -@@ -609,8 +615,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -613,8 +619,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); |