kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] videobuf2-core: call __setup_offsets before buf_init()

Browse source 
Ensure that the offsets are correct before buf_init() is called.
As a consequence the __setup_offsets() function now sets up the
offsets for the given buffer instead of for all new buffers.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-11-20 09:36:49 -02:00 committed by Mauro Carvalho Chehab
parent e32f856ab2
commit 20eedf0e16
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
drivers/media/v4l2-core/videobuf2-core.c
View file

@ -288,37 +288,29 @@ static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb)
/** /**
* __setup_offsets() - setup unique offsets ("cookies") for every plane in * __setup_offsets() - setup unique offsets ("cookies") for every plane in
* every buffer on the queue * the buffer.
*/ */
static void __setup_offsets(struct vb2_queue *q, unsigned int n) static void __setup_offsets(struct vb2_buffer *vb)
{ {
unsigned int buffer, plane; struct vb2_queue *q = vb->vb2_queue;
struct vb2_buffer *vb; unsigned int plane;
unsigned long off; unsigned long off = 0;
if (vb->index) {
struct vb2_buffer *prev = q->bufs[vb->index - 1];
struct vb2_plane *p = &prev->planes[prev->num_planes - 1];
if (q->num_buffers) {
struct vb2_plane *p;
vb = q->bufs[q->num_buffers - 1];
p = &vb->planes[vb->num_planes - 1];
off = PAGE_ALIGN(p->m.offset + p->length); off = PAGE_ALIGN(p->m.offset + p->length);
} else {
off = 0;
} }
for (buffer = q->num_buffers; buffer < q->num_buffers + n; ++buffer) { for (plane = 0; plane < vb->num_planes; ++plane) {
vb = q->bufs[buffer]; vb->planes[plane].m.offset = off;
if (!vb)
continue;
for (plane = 0; plane < vb->num_planes; ++plane) { dprintk(3, "buffer %d, plane %d offset 0x%08lx\n",
vb->planes[plane].m.offset = off; vb->index, plane, off);
dprintk(3, "buffer %d, plane %d offset 0x%08lx\n", off += vb->planes[plane].length;
buffer, plane, off); off = PAGE_ALIGN(off);
off += vb->planes[plane].length;
off = PAGE_ALIGN(off);
}
} }
} }
@ -364,6 +356,7 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory,
q->bufs[vb->index] = NULL; q->bufs[vb->index] = NULL;
break; break;
} }
__setup_offsets(vb);
/* /*
* Call the driver-provided buffer initialization * Call the driver-provided buffer initialization
* callback, if given. An error in initialization * callback, if given. An error in initialization
@ -381,9 +374,6 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum vb2_memory memory,
} }
} }
if (memory == VB2_MEMORY_MMAP)
__setup_offsets(q, buffer);
dprintk(1, "allocated %d buffers, %d plane(s) each\n", dprintk(1, "allocated %d buffers, %d plane(s) each\n",
buffer, num_planes); buffer, num_planes);