Hi Hans,
Thank you for the patch.
On Friday 22 Apr 2016 10:38:08 Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> The allocation context is nothing more than a per-plane device pointer
> to use when allocating buffers. So just provide a dev pointer in vb2_queue
> for that purpose and drivers can skip allocating/releasing/filling in
> the allocation context unless they require different per-plane device
> pointers as used by some Samsung SoCs.
>
> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> Cc: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx>
> Cc: Sakari Ailus <sakari.ailus@xxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> Cc: Florian Echtler <floe@xxxxxxxxxxxxxx>
> Cc: Federico Vaga <federico.vaga@xxxxxxxxx>
> Cc: "Lad, Prabhakar" <prabhakar.csengg@xxxxxxxxx>
> Cc: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Cc: Fabien Dessenne <fabien.dessenne@xxxxxx>
> Cc: Benoit Parrot <bparrot@xxxxxx>
> Cc: Mikhail Ulyanov <mikhail.ulyanov@xxxxxxxxxxxxxxxxxx>
> Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> Cc: Javier Martin <javier.martin@xxxxxxxxxxxxxxxxx>
> Cc: Jonathan Corbet <corbet@xxxxxxx>
> Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxx>
> Cc: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> Cc: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/videobuf2-core.c | 16 +++++++++-------
> include/media/videobuf2-core.h | 3 +++
> 2 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/videobuf2-core.c
> b/drivers/media/v4l2-core/videobuf2-core.c index 5d016f4..88b5e48 100644
> --- a/drivers/media/v4l2-core/videobuf2-core.c
> +++ b/drivers/media/v4l2-core/videobuf2-core.c
> @@ -206,8 +206,9 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)
> for (plane = 0; plane < vb->num_planes; ++plane) {
> unsigned long size = PAGE_ALIGN(vb->planes[plane].length);
>
> - mem_priv = call_ptr_memop(vb, alloc, q->alloc_ctx[plane],
> - size, dma_dir, q->gfp_flags);
> + mem_priv = call_ptr_memop(vb, alloc,
> + q->alloc_ctx[plane] ? : &q->dev,
> + size, dma_dir, q->gfp_flags);
While the videobuf2-dma-sg allocation context indeed only contains a pointer
to the device, the videobuf2-dma-contig context also contains a dma_attrs.
This patch will break the videobuf2-dma-contig alloc implementation.
> if (IS_ERR_OR_NULL(mem_priv))
> goto free;
>
> @@ -1131,9 +1132,10 @@ static int __qbuf_userptr(struct vb2_buffer *vb,
> const void *pb) vb->planes[plane].data_offset = 0;
>
> /* Acquire each plane's memory */
> - mem_priv = call_ptr_memop(vb, get_userptr, q->alloc_ctx[plane],
> - planes[plane].m.userptr,
> - planes[plane].length, dma_dir);
> + mem_priv = call_ptr_memop(vb, get_userptr,
> + q->alloc_ctx[plane] ? : &q->dev,
> + planes[plane].m.userptr,
> + planes[plane].length, dma_dir);
> if (IS_ERR_OR_NULL(mem_priv)) {
> dprintk(1, "failed acquiring userspace "
> "memory for plane %d\n", plane);
> @@ -1256,8 +1258,8 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const
> void *pb)
>
> /* Acquire each plane's memory */
> mem_priv = call_ptr_memop(vb, attach_dmabuf,
> - q->alloc_ctx[plane], dbuf, planes[plane].length,
> - dma_dir);
> + q->alloc_ctx[plane] ? : &q->dev,
> + dbuf, planes[plane].length, dma_dir);
> if (IS_ERR(mem_priv)) {
> dprintk(1, "failed to attach dmabuf\n");
> ret = PTR_ERR(mem_priv);
> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
> index 8a0f55b..0f8b97b 100644
> --- a/include/media/videobuf2-core.h
> +++ b/include/media/videobuf2-core.h
> @@ -397,6 +397,8 @@ struct vb2_buf_ops {
> * caller. For example, for V4L2, it should match
> * the V4L2_BUF_TYPE_* in include/uapi/linux/videodev2.h
> * @io_modes: supported io methods (see vb2_io_modes enum)
> + * @dev: device to use for the default allocation context if the driver
> + * doesn't fill in the @alloc_ctx array.
> * @fileio_read_once: report EOF after reading the first buffer
> * @fileio_write_immediately: queue buffer after each write() call
> * @allow_zero_bytesused: allow bytesused == 0 to be passed to the driver
> @@ -460,6 +462,7 @@ struct vb2_buf_ops {
> struct vb2_queue {
> unsigned int type;
> unsigned int io_modes;
> + struct device *dev;
> unsigned fileio_read_once:1;
> unsigned fileio_write_immediately:1;
> unsigned allow_zero_bytesused:1;
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
