aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-18 09:50:59 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-25 08:51:44 -0200
commitd935c57e8fb6902a9ede603bb55d9e158f75f09a (patch)
treef2640e64127e2a8cc1fedc55830fc37aab3ae540 /include/media
parent[media] vb2: replace 'write' by 'dma_dir' (diff)
downloadlinux-dev-d935c57e8fb6902a9ede603bb55d9e158f75f09a.tar.xz
linux-dev-d935c57e8fb6902a9ede603bb55d9e158f75f09a.zip
[media] vb2: add dma_dir to the alloc memop
This is needed for the next patch where the dma-sg alloc memop needs to know the dma_dir. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Pawel Osciak <pawel@osciak.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf2-core.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index d607871749c7..bd2cec2d6c3d 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -82,7 +82,9 @@ struct vb2_threadio_data;
* unmap_dmabuf.
*/
struct vb2_mem_ops {
- void *(*alloc)(void *alloc_ctx, unsigned long size, gfp_t gfp_flags);
+ void *(*alloc)(void *alloc_ctx, unsigned long size,
+ enum dma_data_direction dma_dir,
+ gfp_t gfp_flags);
void (*put)(void *buf_priv);
struct dma_buf *(*get_dmabuf)(void *buf_priv, unsigned long flags);