V4L/DVB: v4l videobuf: add videobuf_buffer *buf as argument to mmap_mapper

mmap_mapper should operate on a buffer, not on a complete queue. So let
the videobuf-core find the correct buffer instead of duplicating that
code in each mmap_mapper implementation.

The dma-sg implementation has backwards compatibility code for handling
the V4L1_COMPAT layer. This code is now under the v4L1_COMPAT config option.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 26 deletions

diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
index ad655839827b..f8b5b5635113 100644
--- a/drivers/media/video/videobuf-vmalloc.c
+++ b/drivers/media/video/videobuf-vmalloc.c
@@ -236,47 +236,28 @@ static int __videobuf_sync(struct videobuf_queue *q,
 }
 
 static int __videobuf_mmap_mapper(struct videobuf_queue *q,
-                         struct vm_area_struct *vma)
+                                  struct videobuf_buffer *buf,
+                                  struct vm_area_struct *vma)
 {
         struct videobuf_vmalloc_memory *mem;
         struct videobuf_mapping *map;
-        unsigned int first;
         int retval, pages;
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
 
         dprintk(1, "%s\n", __func__);
-        if (!(vma->vm_flags & VM_WRITE) || !(vma->vm_flags & VM_SHARED))
-                return -EINVAL;
-
-        /* look for first buffer to map */
-        for (first = 0; first < VIDEO_MAX_FRAME; first++) {
-                if (NULL == q->bufs[first])
-                        continue;
-
-                if (V4L2_MEMORY_MMAP != q->bufs[first]->memory)
-                        continue;
-                if (q->bufs[first]->boff == offset)
-                        break;
-        }
-        if (VIDEO_MAX_FRAME == first) {
-                dprintk(1, "mmap app bug: offset invalid [offset=0x%lx]\n",
-                        (vma->vm_pgoff << PAGE_SHIFT));
-                return -EINVAL;
-        }
 
         /* create mapping + update buffer list */
         map = kzalloc(sizeof(struct videobuf_mapping), GFP_KERNEL);
         if (NULL == map)
                 return -ENOMEM;
 
-        q->bufs[first]->map = map;
+        buf->map = map;
         map->start = vma->vm_start;
         map->end   = vma->vm_end;
         map->q     = q;
 
-        q->bufs[first]->baddr = vma->vm_start;
+        buf->baddr = vma->vm_start;
 
-        mem = q->bufs[first]->priv;
+        mem = buf->priv;
         BUG_ON(!mem);
         MAGIC_CHECK(mem->magic, MAGIC_VMAL_MEM);
 
@@ -302,8 +283,8 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
 
         dprintk(1, "mmap %p: q=%p %08lx-%08lx (%lx) pgoff %08lx buf %d\n",
                 map, q, vma->vm_start, vma->vm_end,
-                (long int) q->bufs[first]->bsize,
-                vma->vm_pgoff, first);
+                (long int)buf->bsize,
+                vma->vm_pgoff, buf->i);
 
         videobuf_vm_open(vma);