Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cbefad0 authored by Tuukka Toivonen's avatar Tuukka Toivonen Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13165): videobuf do not force buffer size to be multiple of PAGE_SIZE 



When the image size (bytesperline*height) is not multiple
of PAGE_SIZE, v4l2 rounded the required buffer size to
be multiple of PAGE_SIZE. This prevented user space
to store images directly into userptr buffers which were
not multiple of PAGE_SIZE. This constraint is removed.

The start address is still assumed to be required
page-aligned, ie., when v4l2 allocates mmap buffers,
the offset between different buffers is page-aligned.

Signed-off-by: default avatarTuukka Toivonen <tuukka.o.toivonen@nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 131db3a1

drivers/media/video/videobuf-core.c

+3 −4
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ int __videobuf_mmap_setup(struct videobuf_queue *q, 
		q->bufs[i]->bsize  = bsize;

		switch (memory) {

		case V4L2_MEMORY_MMAP:

			q->bufs[i]->boff  = bsize * i;

			q->bufs[i]->boff = PAGE_ALIGN(bsize) * i;

			break;

		case V4L2_MEMORY_USERPTR:

		case V4L2_MEMORY_OVERLAY:
@@ -430,9 +430,8 @@ int videobuf_reqbufs(struct videobuf_queue *q, 
		count = VIDEO_MAX_FRAME;

	size = 0;

	q->ops->buf_setup(q, &count, &size);

	size = PAGE_ALIGN(size);

	dprintk(1, "reqbufs: bufs=%d, size=0x%x [%d pages total]\n",

		count, size, (count*size)>>PAGE_SHIFT);

		count, size, (count*PAGE_ALIGN(size))>>PAGE_SHIFT);



	retval = __videobuf_mmap_setup(q, count, size, req->memory);

	if (retval < 0) {
@@ -1099,7 +1098,7 @@ int videobuf_cgmbuf(struct videobuf_queue *q, 
	mbuf->size   = 0;

	for (i = 0; i < mbuf->frames; i++) {

		mbuf->offsets[i]  = q->bufs[i]->boff;

		mbuf->size       += q->bufs[i]->bsize;

		mbuf->size       += PAGE_ALIGN(q->bufs[i]->bsize);

	}



	return 0;

drivers/media/video/videobuf-dma-sg.c

+2 −2
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, 
			retval = -EBUSY;

			goto done;

		}

		size += q->bufs[last]->bsize;

		size += PAGE_ALIGN(q->bufs[last]->bsize);

		if (size == (vma->vm_end - vma->vm_start))

			break;

	}
@@ -610,7 +610,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, 
			continue;

		q->bufs[i]->map   = map;

		q->bufs[i]->baddr = vma->vm_start + size;

		size += q->bufs[i]->bsize;

		size += PAGE_ALIGN(q->bufs[i]->bsize);

	}



	map->count    = 1;