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: Tuukka Toivonen <tuukka.o.toivonen@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 032ebae0134a..a583d394696e 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -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;