leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: videobuf2: factor out planes prepare/finish functions

Browse Source 
Factor out the code, no functional changes.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sergey Senozhatsky 2020-05-14 18:01:46 +02:00 committed by Mauro Carvalho Chehab
parent 1e0b2318fa
commit 38a417e88a
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,32 @@ static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb)
__vb2_plane_dmabuf_put(vb, &vb->planes[plane]); __vb2_plane_dmabuf_put(vb, &vb->planes[plane]);
} }
/*
* __vb2_buf_mem_prepare() - call ->prepare() on buffer's private memory
* to sync caches
*/
static void __vb2_buf_mem_prepare(struct vb2_buffer *vb)
{
unsigned int plane;
for (plane = 0; plane < vb->num_planes; ++plane)
call_void_memop(vb, prepare, vb->planes[plane].mem_priv);
vb->synced = 1;
}
/*
* __vb2_buf_mem_finish() - call ->finish on buffer's private memory
* to sync caches
*/
static void __vb2_buf_mem_finish(struct vb2_buffer *vb)
{
unsigned int plane;
for (plane = 0; plane < vb->num_planes; ++plane)
call_void_memop(vb, finish, vb->planes[plane].mem_priv);
vb->synced = 0;
}
/* /*
* __setup_offsets() - setup unique offsets ("cookies") for every plane in * __setup_offsets() - setup unique offsets ("cookies") for every plane in
* the buffer. * the buffer.
@ -959,7 +985,6 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
{ {
struct vb2_queue *q = vb->vb2_queue; struct vb2_queue *q = vb->vb2_queue;
unsigned long flags; unsigned long flags;
unsigned int plane;
if (WARN_ON(vb->state != VB2_BUF_STATE_ACTIVE)) if (WARN_ON(vb->state != VB2_BUF_STATE_ACTIVE))
return; return;
@ -979,12 +1004,8 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
dprintk(4, "done processing on buffer %d, state: %d\n", dprintk(4, "done processing on buffer %d, state: %d\n",
vb->index, state); vb->index, state);
if (state != VB2_BUF_STATE_QUEUED) { if (state != VB2_BUF_STATE_QUEUED)
/* sync buffers */ __vb2_buf_mem_finish(vb);
for (plane = 0; plane < vb->num_planes; ++plane)
call_void_memop(vb, finish, vb->planes[plane].mem_priv);
vb->synced = 0;
}
spin_lock_irqsave(&q->done_lock, flags); spin_lock_irqsave(&q->done_lock, flags);
if (state == VB2_BUF_STATE_QUEUED) { if (state == VB2_BUF_STATE_QUEUED) {
@ -1309,7 +1330,6 @@ static int __buf_prepare(struct vb2_buffer *vb)
{ {
struct vb2_queue *q = vb->vb2_queue; struct vb2_queue *q = vb->vb2_queue;
enum vb2_buffer_state orig_state = vb->state; enum vb2_buffer_state orig_state = vb->state;
unsigned int plane;
int ret; int ret;
if (q->error) { if (q->error) {
@ -1353,11 +1373,7 @@ static int __buf_prepare(struct vb2_buffer *vb)
return ret; return ret;
} }
/* sync buffers */ __vb2_buf_mem_prepare(vb);
for (plane = 0; plane < vb->num_planes; ++plane)
call_void_memop(vb, prepare, vb->planes[plane].mem_priv);
vb->synced = 1;
vb->prepared = 1; vb->prepared = 1;
vb->state = orig_state; vb->state = orig_state;
@ -1977,14 +1993,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
call_void_vb_qop(vb, buf_request_complete, vb); call_void_vb_qop(vb, buf_request_complete, vb);
} }
if (vb->synced) { if (vb->synced)
unsigned int plane; __vb2_buf_mem_finish(vb);
for (plane = 0; plane < vb->num_planes; ++plane)
call_void_memop(vb, finish,
vb->planes[plane].mem_priv);
vb->synced = 0;
}
if (vb->prepared) { if (vb->prepared) {
call_void_vb_qop(vb, buf_finish, vb); call_void_vb_qop(vb, buf_finish, vb);