diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-15 18:35:20 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-15 22:13:31 +0100 |
commit | 90118c7656bb55243620c9dc9cc3f12582b1807f (patch) | |
tree | b10844577223af08bc2413c70447a71ac72ac3c1 /patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | |
parent | 9ba3c9d2ee39ee7a4f8a2d7d69e417e267a22827 (diff) |
patches: refresh on v4.2.6v4.2.6-1linux-4.2.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.72 [ OK ]
4 3.3.8 [ OK ]
5 3.4.110 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.92 [ OK ]
12 3.11.10 [ OK ]
13 3.12.49 [ OK ]
14 3.13.11 [ OK ]
15 3.14.56 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.23 [ OK ]
20 3.19.8 [ OK ]
21 4.0.9 [ OK ]
22 4.1.12 [ OK ]
23 4.2.5 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch')
-rw-r--r-- | patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch index 3ceff918..2103aa65 100644 --- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch +++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch @@ -88,7 +88,7 @@ else __vb2_buf_userptr_put(vb); } -@@ -784,6 +788,7 @@ static int __verify_mmap_ops(struct vb2_ +@@ -785,6 +789,7 @@ static int __verify_mmap_ops(struct vb2_ return 0; } @@ -96,7 +96,7 @@ /** * __verify_dmabuf_ops() - verify that all memory operations required for * DMABUF queue type have been provided -@@ -797,6 +802,7 @@ static int __verify_dmabuf_ops(struct vb +@@ -798,6 +803,7 @@ static int __verify_dmabuf_ops(struct vb return 0; } @@ -104,7 +104,7 @@ /** * __verify_memory_type() - Check whether the memory type and buffer type -@@ -830,10 +836,12 @@ static int __verify_memory_type(struct v +@@ -831,10 +837,12 @@ static int __verify_memory_type(struct v return -EINVAL; } @@ -117,7 +117,7 @@ /* * Place the busy tests at the end: -EBUSY can be ignored when -@@ -1499,6 +1507,7 @@ err: +@@ -1509,6 +1517,7 @@ err: return ret; } @@ -125,7 +125,7 @@ /** * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer */ -@@ -1617,6 +1626,7 @@ err: +@@ -1627,6 +1636,7 @@ err: return ret; } @@ -133,7 +133,7 @@ /** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing -@@ -1679,9 +1689,11 @@ static int __buf_prepare(struct vb2_buff +@@ -1689,9 +1699,11 @@ static int __buf_prepare(struct vb2_buff ret = __qbuf_userptr(vb, b); up_read(¤t->mm->mmap_sem); break; @@ -145,7 +145,7 @@ default: WARN(1, "Invalid queue type\n"); ret = -EINVAL; -@@ -2072,8 +2084,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe +@@ -2082,8 +2094,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) -@@ -2081,6 +2095,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2091,6 +2105,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) { -@@ -2089,6 +2104,7 @@ static void __vb2_dqbuf(struct vb2_buffe +@@ -2099,6 +2114,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) -@@ -2399,6 +2415,7 @@ static int __find_plane_by_offset(struct +@@ -2409,6 +2425,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 -@@ -2476,6 +2493,7 @@ int vb2_expbuf(struct vb2_queue *q, stru +@@ -2486,6 +2503,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 -@@ -3421,6 +3439,7 @@ int vb2_ioctl_streamoff(struct file *fil +@@ -3431,6 +3449,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); -@@ -3430,6 +3449,7 @@ int vb2_ioctl_expbuf(struct file *file, +@@ -3440,6 +3459,7 @@ int vb2_ioctl_expbuf(struct file *file, return vb2_expbuf(vdev->queue, p); } EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf); @@ -367,7 +367,7 @@ void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); -@@ -463,7 +467,9 @@ void vb2_queue_release(struct vb2_queue +@@ -465,7 +469,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); @@ -377,7 +377,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); -@@ -637,8 +643,10 @@ int vb2_ioctl_qbuf(struct file *file, vo +@@ -639,8 +645,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); @@ -390,7 +390,7 @@ --- a/drivers/media/platform/am437x/am437x-vpfe.c +++ b/drivers/media/platform/am437x/am437x-vpfe.c -@@ -2257,7 +2257,9 @@ static const struct v4l2_ioctl_ops vpfe_ +@@ -2267,7 +2267,9 @@ static const struct v4l2_ioctl_ops vpfe_ .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf, |