Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d935c57e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent cd474037

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

+3 −1
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q); 
static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)

{

	struct vb2_queue *q = vb->vb2_queue;

	enum dma_data_direction dma_dir =

		V4L2_TYPE_IS_OUTPUT(q->type) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;

	void *mem_priv;

	int plane;
@@ -200,7 +202,7 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb) 
		unsigned long size = PAGE_ALIGN(q->plane_sizes[plane]);



		mem_priv = call_ptr_memop(vb, alloc, q->alloc_ctx[plane],

				      size, q->gfp_flags);

				      size, dma_dir, q->gfp_flags);

		if (IS_ERR_OR_NULL(mem_priv))

			goto free;

drivers/media/v4l2-core/videobuf2-dma-contig.c

+3 −1
Original line number Diff line number Diff line
@@ -155,7 +155,8 @@ static void vb2_dc_put(void *buf_priv) 
	kfree(buf);

}



static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)

static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size,

			  enum dma_data_direction dma_dir, gfp_t gfp_flags)

{

	struct vb2_dc_conf *conf = alloc_ctx;

	struct device *dev = conf->dev;
@@ -176,6 +177,7 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags) 
	/* Prevent the device from being released while the buffer is used */

	buf->dev = get_device(dev);

	buf->size = size;

	buf->dma_dir = dma_dir;



	buf->handler.refcount = &buf->refcount;

	buf->handler.put = vb2_dc_put;

drivers/media/v4l2-core/videobuf2-dma-sg.c

+3 −2
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf, 
	return 0;

}



static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)

static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,

			      enum dma_data_direction dma_dir, gfp_t gfp_flags)

{

	struct vb2_dma_sg_buf *buf;

	int ret;
@@ -97,7 +98,7 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla 
		return NULL;



	buf->vaddr = NULL;

	buf->dma_dir = DMA_NONE;

	buf->dma_dir = dma_dir;

	buf->offset = 0;

	buf->size = size;

	/* size is already page aligned */

drivers/media/v4l2-core/videobuf2-vmalloc.c

+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ struct vb2_vmalloc_buf { 


static void vb2_vmalloc_put(void *buf_priv);



static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)

static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size,

			       enum dma_data_direction dma_dir, gfp_t gfp_flags)

{

	struct vb2_vmalloc_buf *buf;
@@ -45,6 +46,7 @@ static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fl 


	buf->size = size;

	buf->vaddr = vmalloc_user(buf->size);

	buf->dma_dir = dma_dir;

	buf->handler.refcount = &buf->refcount;

	buf->handler.put = vb2_vmalloc_put;

	buf->handler.arg = buf;

include/media/videobuf2-core.h

+3 −1
Original line number Diff line number Diff line
@@ -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);