Commit 7b4b4555 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Mauro Carvalho Chehab
Browse files

media: videobuf2: add queue memory consistency parameter 



Preparations for future V4L2_FLAG_MEMORY_NON_CONSISTENT support.

Extend vb2_core_reqbufs() parameters list to accept requests'
->flags, which will be used for memory consistency configuration.

An attempt to allocate a buffer with consistency requirements
which don't match queue's consistency model will fail.

Signed-off-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ac53503e

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

+41 −10
Original line number Diff line number Diff line
@@ -664,11 +664,33 @@ int vb2_verify_memory_type(struct vb2_queue *q, 
}

EXPORT_SYMBOL(vb2_verify_memory_type);



static void set_queue_consistency(struct vb2_queue *q, bool consistent_mem)

{

	q->dma_attrs &= ~DMA_ATTR_NON_CONSISTENT;



	if (!vb2_queue_allows_cache_hints(q))

		return;

	if (!consistent_mem)

		q->dma_attrs |= DMA_ATTR_NON_CONSISTENT;

}



static bool verify_consistency_attr(struct vb2_queue *q, bool consistent_mem)

{

	bool queue_is_consistent = !(q->dma_attrs & DMA_ATTR_NON_CONSISTENT);



	if (consistent_mem != queue_is_consistent) {

		dprintk(1, "memory consistency model mismatch\n");

		return false;

	}

	return true;

}



int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,

		unsigned int *count)

		     unsigned int flags, unsigned int *count)

{

	unsigned int num_buffers, allocated_buffers, num_planes = 0;

	unsigned plane_sizes[VB2_MAX_PLANES] = { };

	bool consistent_mem = true;

	unsigned int i;

	int ret;
@@ -683,7 +705,8 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, 
	}



	if (*count == 0 || q->num_buffers != 0 ||

	    (q->memory != VB2_MEMORY_UNKNOWN && q->memory != memory)) {

	    (q->memory != VB2_MEMORY_UNKNOWN && q->memory != memory) ||

	    !verify_consistency_attr(q, consistent_mem)) {

		/*

		 * We already have buffers allocated, so first check if they

		 * are not in use and can be freed.
@@ -720,6 +743,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, 
	num_buffers = min_t(unsigned int, num_buffers, VB2_MAX_FRAME);

	memset(q->alloc_devs, 0, sizeof(q->alloc_devs));

	q->memory = memory;

	set_queue_consistency(q, consistent_mem);



	/*

	 * Ask the driver how many buffers and planes per buffer it requires.
@@ -804,11 +828,13 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, 
EXPORT_SYMBOL_GPL(vb2_core_reqbufs);



int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,

		unsigned int *count, unsigned requested_planes,

		const unsigned requested_sizes[])

			 unsigned int flags, unsigned int *count,

			 unsigned int requested_planes,

			 const unsigned int requested_sizes[])

{

	unsigned int num_planes = 0, num_buffers, allocated_buffers;

	unsigned plane_sizes[VB2_MAX_PLANES] = { };

	bool consistent_mem = true;

	int ret;



	if (q->num_buffers == VB2_MAX_FRAME) {
@@ -823,11 +849,16 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory, 
		}

		memset(q->alloc_devs, 0, sizeof(q->alloc_devs));

		q->memory = memory;

		set_queue_consistency(q, consistent_mem);

		q->waiting_for_buffers = !q->is_output;

	} else if (q->memory != memory) {

	} else {

		if (q->memory != memory) {

			dprintk(1, "memory model mismatch\n");

			return -EINVAL;

		}

		if (!verify_consistency_attr(q, consistent_mem))

			return -EINVAL;

	}



	num_buffers = min(*count, VB2_MAX_FRAME - q->num_buffers);
@@ -2498,7 +2529,7 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) 
	fileio->memory = VB2_MEMORY_MMAP;

	fileio->type = q->type;

	q->fileio = fileio;

	ret = vb2_core_reqbufs(q, fileio->memory, &fileio->count);

	ret = vb2_core_reqbufs(q, fileio->memory, 0, &fileio->count);

	if (ret)

		goto err_kfree;
@@ -2555,7 +2586,7 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) 


err_reqbufs:

	fileio->count = 0;

	vb2_core_reqbufs(q, fileio->memory, &fileio->count);

	vb2_core_reqbufs(q, fileio->memory, 0, &fileio->count);



err_kfree:

	q->fileio = NULL;
@@ -2575,7 +2606,7 @@ static int __vb2_cleanup_fileio(struct vb2_queue *q) 
		vb2_core_streamoff(q, q->type);

		q->fileio = NULL;

		fileio->count = 0;

		vb2_core_reqbufs(q, fileio->memory, &fileio->count);

		vb2_core_reqbufs(q, fileio->memory, 0, &fileio->count);

		kfree(fileio);

		dprintk(3, "file io emulator closed\n");

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) 
	int ret = vb2_verify_memory_type(q, req->memory, req->type);



	fill_buf_caps(q, &req->capabilities);

	return ret ? ret : vb2_core_reqbufs(q, req->memory, &req->count);

	return ret ? ret : vb2_core_reqbufs(q, req->memory, 0, &req->count);

}

EXPORT_SYMBOL_GPL(vb2_reqbufs);
@@ -797,7 +797,7 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) 
	for (i = 0; i < requested_planes; i++)

		if (requested_sizes[i] == 0)

			return -EINVAL;

	return ret ? ret : vb2_core_create_bufs(q, create->memory,

	return ret ? ret : vb2_core_create_bufs(q, create->memory, 0,

		&create->count, requested_planes, requested_sizes);

}

EXPORT_SYMBOL_GPL(vb2_create_bufs);
@@ -973,7 +973,7 @@ int vb2_ioctl_reqbufs(struct file *file, void *priv, 
		return res;

	if (vb2_queue_is_busy(vdev, file))

		return -EBUSY;

	res = vb2_core_reqbufs(vdev->queue, p->memory, &p->count);

	res = vb2_core_reqbufs(vdev->queue, p->memory, 0, &p->count);

	/* If count == 0, then the owner has released all buffers and he

	   is no longer owner of the queue. Otherwise we have a new owner. */

	if (res == 0)

drivers/media/dvb-core/dvb_vb2.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req) 


	ctx->buf_siz = req->size;

	ctx->buf_cnt = req->count;

	ret = vb2_core_reqbufs(&ctx->vb_q, VB2_MEMORY_MMAP, &req->count);

	ret = vb2_core_reqbufs(&ctx->vb_q, VB2_MEMORY_MMAP, 0, &req->count);

	if (ret) {

		ctx->state = DVB_VB2_STATE_NONE;

		dprintk(1, "[%s] count=%d size=%d errno=%d\n", ctx->name,

include/media/videobuf2-core.h

+6 −2
Original line number Diff line number Diff line
@@ -740,6 +740,8 @@ void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb); 
 * vb2_core_reqbufs() - Initiate streaming.

 * @q:		pointer to &struct vb2_queue with videobuf2 queue.

 * @memory:	memory type, as defined by &enum vb2_memory.

 * @flags:	auxiliary queue/buffer management flags. Currently, the only

 *		used flag is %V4L2_FLAG_MEMORY_NON_CONSISTENT.

 * @count:	requested buffer count.

 *

 * Videobuf2 core helper to implement VIDIOC_REQBUF() operation. It is called
@@ -764,12 +766,13 @@ void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb); 
 * Return: returns zero on success; an error code otherwise.

 */

int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,

		unsigned int *count);

		    unsigned int flags, unsigned int *count);



/**

 * vb2_core_create_bufs() - Allocate buffers and any required auxiliary structs

 * @q: pointer to &struct vb2_queue with videobuf2 queue.

 * @memory: memory type, as defined by &enum vb2_memory.

 * @flags: auxiliary queue/buffer management flags.

 * @count: requested buffer count.

 * @requested_planes: number of planes requested.

 * @requested_sizes: array with the size of the planes.
@@ -787,7 +790,8 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, 
 * Return: returns zero on success; an error code otherwise.

 */

int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,

			 unsigned int *count, unsigned int requested_planes,

			 unsigned int flags, unsigned int *count,

			 unsigned int requested_planes,

			 const unsigned int requested_sizes[]);



/**