Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: vb2: videobuf -> videobuf2

Browse Source 
It is confusing to use the term 'videobuf' or 'video-buf' since that
usually refers to the old videobuf version 1 framework. Rename to
'videobuf2' or vb2.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans Verkuil 2022-08-10 15:01:23 +02:00 committed by Mauro Carvalho Chehab
parent b02c4a5293
commit 3e947c36af
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/common/videobuf2/videobuf2-core.c
View File

@ -398,7 +398,7 @@ static void init_buffer_cache_hints(struct vb2_queue *q, struct vb2_buffer *vb)
} }
/* /*
* __vb2_queue_alloc() - allocate videobuf buffer structures and (for MMAP type) * __vb2_queue_alloc() - allocate vb2 buffer structures and (for MMAP type)
* video buffer memory for all buffers/planes on the queue and initializes the * video buffer memory for all buffers/planes on the queue and initializes the
* queue * queue
* *
@ -417,7 +417,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory,
VB2_MAX_FRAME - q->num_buffers); VB2_MAX_FRAME - q->num_buffers);
for (buffer = 0; buffer < num_buffers; ++buffer) { for (buffer = 0; buffer < num_buffers; ++buffer) {
/* Allocate videobuf buffer structures */ /* Allocate vb2 buffer structures */
vb = kzalloc(q->buf_struct_size, GFP_KERNEL); vb = kzalloc(q->buf_struct_size, GFP_KERNEL);
if (!vb) { if (!vb) {
dprintk(q, 1, "memory alloc for buffer struct failed\n"); dprintk(q, 1, "memory alloc for buffer struct failed\n");
@ -599,7 +599,7 @@ static int __vb2_queue_free(struct vb2_queue *q, unsigned int buffers)
} }
#endif #endif
/* Free videobuf buffers */ /* Free vb2 buffers */
for (buffer = q->num_buffers - buffers; buffer < q->num_buffers; for (buffer = q->num_buffers - buffers; buffer < q->num_buffers;
++buffer) { ++buffer) {
kfree(q->bufs[buffer]); kfree(q->bufs[buffer]);
@ -1949,7 +1949,7 @@ int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb,
if (pb) if (pb)
call_void_bufop(q, fill_user_buffer, vb, pb); call_void_bufop(q, fill_user_buffer, vb, pb);
/* Remove from videobuf queue */ /* Remove from vb2 queue */
list_del(&vb->queued_entry); list_del(&vb->queued_entry);
q->queued_count--; q->queued_count--;
@ -1978,7 +1978,7 @@ EXPORT_SYMBOL_GPL(vb2_core_dqbuf);
* __vb2_queue_cancel() - cancel and stop (pause) streaming * __vb2_queue_cancel() - cancel and stop (pause) streaming
* *
* Removes all queued buffers from driver's queue and all buffers queued by * Removes all queued buffers from driver's queue and all buffers queued by
* userspace from videobuf's queue. Returns to state after reqbufs. * userspace from vb2's queue. Returns to state after reqbufs.
*/ */
static void __vb2_queue_cancel(struct vb2_queue *q) static void __vb2_queue_cancel(struct vb2_queue *q)
{ {
@ -2016,7 +2016,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
q->uses_qbuf = 0; q->uses_qbuf = 0;
/* /*
* Remove all buffers from videobuf's list... * Remove all buffers from vb2's list...
*/ */
INIT_LIST_HEAD(&q->queued_list); INIT_LIST_HEAD(&q->queued_list);
/* /*
@ -2139,7 +2139,7 @@ int vb2_core_streamoff(struct vb2_queue *q, unsigned int type)
/* /*
* Cancel will pause streaming and remove all buffers from the driver * Cancel will pause streaming and remove all buffers from the driver
* and videobuf, effectively returning control over them to userspace. * and vb2, effectively returning control over them to userspace.
* *
* Note that we do this even if q->streaming == 0: if you prepare or * Note that we do this even if q->streaming == 0: if you prepare or
* queue buffers, and then call streamoff without ever having called * queue buffers, and then call streamoff without ever having called

4
drivers/media/common/videobuf2/videobuf2-dvb.c
View File

@ -3,8 +3,8 @@
* *
* some helper function for simple DVB cards which simply DMA the * some helper function for simple DVB cards which simply DMA the
* complete transport stream and let the computer sort everything else * complete transport stream and let the computer sort everything else
* (i.e. we are using the software demux, ...). Also uses the * (i.e. we are using the software demux, ...). Also uses vb2
* video-buf to manage DMA buffers. * to manage DMA buffers.
* *
* (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs] * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
*/ */

4
drivers/media/common/videobuf2/videobuf2-v4l2.c
View File

@ -268,7 +268,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
/* /*
* Single-planar buffers do not use planes array, * Single-planar buffers do not use planes array,
* so fill in relevant v4l2_buffer struct fields instead. * so fill in relevant v4l2_buffer struct fields instead.
* In videobuf we use our internal V4l2_planes struct for * In vb2 we use our internal V4l2_planes struct for
* single-planar buffers as well, for simplicity. * single-planar buffers as well, for simplicity.
* *
* If bytesused == 0 for the output buffer, then fall back * If bytesused == 0 for the output buffer, then fall back
@ -652,7 +652,7 @@ EXPORT_SYMBOL_GPL(vb2_find_buffer);
/* /*
* vb2_querybuf() - query video buffer information * vb2_querybuf() - query video buffer information
* @q: videobuf queue * @q: vb2 queue
* @b: buffer struct passed from userspace to vidioc_querybuf handler * @b: buffer struct passed from userspace to vidioc_querybuf handler
* in driver * in driver
* *

16
include/media/videobuf2-core.h
View File

@ -65,7 +65,7 @@ struct vb2_buffer;
* DMABUF memory types. * DMABUF memory types.
* @get_userptr: acquire userspace memory for a hardware operation; used for * @get_userptr: acquire userspace memory for a hardware operation; used for
* USERPTR memory types; vaddr is the address passed to the * USERPTR memory types; vaddr is the address passed to the
* videobuf layer when queuing a video buffer of USERPTR type; * videobuf2 layer when queuing a video buffer of USERPTR type;
* should return an allocator private per-buffer structure * should return an allocator private per-buffer structure
* associated with the buffer on success, ERR_PTR() on failure; * associated with the buffer on success, ERR_PTR() on failure;
* the returned private structure will then be passed as @buf_priv * the returned private structure will then be passed as @buf_priv
@ -97,7 +97,7 @@ struct vb2_buffer;
* associated with the passed private structure or NULL if not * associated with the passed private structure or NULL if not
* available. * available.
* @num_users: return the current number of users of a memory buffer; * @num_users: return the current number of users of a memory buffer;
* return 1 if the videobuf layer (or actually the driver using * return 1 if the videobuf2 layer (or actually the driver using
* it) is the only user. * it) is the only user.
* @mmap: setup a userspace mapping for a given memory buffer under * @mmap: setup a userspace mapping for a given memory buffer under
* the provided virtual memory region. * the provided virtual memory region.
@ -210,11 +210,11 @@ enum vb2_io_modes {
* enum vb2_buffer_state - current video buffer state. * enum vb2_buffer_state - current video buffer state.
* @VB2_BUF_STATE_DEQUEUED: buffer under userspace control. * @VB2_BUF_STATE_DEQUEUED: buffer under userspace control.
* @VB2_BUF_STATE_IN_REQUEST: buffer is queued in media request. * @VB2_BUF_STATE_IN_REQUEST: buffer is queued in media request.
* @VB2_BUF_STATE_PREPARING: buffer is being prepared in videobuf. * @VB2_BUF_STATE_PREPARING: buffer is being prepared in videobuf2.
* @VB2_BUF_STATE_QUEUED: buffer queued in videobuf, but not in driver. * @VB2_BUF_STATE_QUEUED: buffer queued in videobuf2, but not in driver.
* @VB2_BUF_STATE_ACTIVE: buffer queued in driver and possibly used * @VB2_BUF_STATE_ACTIVE: buffer queued in driver and possibly used
* in a hardware operation. * in a hardware operation.
* @VB2_BUF_STATE_DONE: buffer returned from driver to videobuf, but * @VB2_BUF_STATE_DONE: buffer returned from driver to videobuf2, but
* not yet dequeued to userspace. * not yet dequeued to userspace.
* @VB2_BUF_STATE_ERROR: same as above, but the operation on the buffer * @VB2_BUF_STATE_ERROR: same as above, but the operation on the buffer
* has ended with an error, which will be reported * has ended with an error, which will be reported
@ -466,7 +466,7 @@ struct vb2_buf_ops {
}; };
/** /**
* struct vb2_queue - a videobuf queue. * struct vb2_queue - a videobuf2 queue.
* *
* @type: private buffer type whose content is defined by the vb2-core * @type: private buffer type whose content is defined by the vb2-core
* caller. For example, for V4L2, it should match * caller. For example, for V4L2, it should match
@ -544,7 +544,7 @@ struct vb2_buf_ops {
* @mmap_lock: private mutex used when buffers are allocated/freed/mmapped * @mmap_lock: private mutex used when buffers are allocated/freed/mmapped
* @memory: current memory type used * @memory: current memory type used
* @dma_dir: DMA mapping direction. * @dma_dir: DMA mapping direction.
* @bufs: videobuf buffer structures * @bufs: videobuf2 buffer structures
* @num_buffers: number of allocated/used buffers * @num_buffers: number of allocated/used buffers
* @queued_list: list of buffers currently queued from userspace * @queued_list: list of buffers currently queued from userspace
* @queued_count: number of buffers queued and ready for streaming. * @queued_count: number of buffers queued and ready for streaming.
@ -683,7 +683,7 @@ void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no);
void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no); void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no);
/** /**
* vb2_buffer_done() - inform videobuf that an operation on a buffer * vb2_buffer_done() - inform videobuf2 that an operation on a buffer
* is finished. * is finished.
* @vb: pointer to &struct vb2_buffer to be used. * @vb: pointer to &struct vb2_buffer to be used.
* @state: state of the buffer, as defined by &enum vb2_buffer_state. * @state: state of the buffer, as defined by &enum vb2_buffer_state.

2
include/media/videobuf2-dvb.h
View File

@ -24,7 +24,7 @@ struct vb2_dvb {
struct dvb_frontend *frontend; struct dvb_frontend *frontend;
struct vb2_queue dvbq; struct vb2_queue dvbq;
/* video-buf-dvb state info */ /* vb2-dvb state info */
struct mutex lock; struct mutex lock;
int nfeeds; int nfeeds;