OMAP2: Camera: Adapt to use new videobuf and scatterlist code

Also take into account that videobuf_reqbufs now returns number of
buffers when it succeeds.

(Thanks for Eduardo Valentin for initial patch.)

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 0cb82fdb8de2d2ecdf7f557aa5d064c8bb9b5ef9..29eb904f0c14e8fb7c88c930cf611bbc9b672d7a 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -712,7 +712,8 @@ config VIDEO_CAFE_CCIC
 
 config VIDEO_OMAP2
        tristate "OMAP 2 Camera support (EXPERIMENTAL)"
-       select VIDEO_BUF
+       select VIDEOBUF_GEN
+       select VIDEOBUF_DMA_SG
        depends on VIDEO_V4L2 && ARCH_OMAP24XX
        ---help---
          Driver for an OMAP 2 camera controller.

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 8fda9e1c2a71e5c09179bb7dc9eca70f0b4b7c41..d394eab38d4ca6eef9072edde32fb3f73662d901 100644 (file)
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -226,27 +226,28 @@ static void omap24xxcam_core_isr(struct omap24xxcam_device *cam)
  */
 static void omap24xxcam_vbq_free_mmap_buffer(struct videobuf_buffer *vb)
 {
-       int i;
+       struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
        size_t alloc_size;
        struct page *page;
+       int i;
 
-       if (vb->dma.sglist == NULL)
+       if (dma->sglist == NULL)
                return;
 
-       i = vb->dma.sglen;
+       i = dma->sglen;
        while (i) {
                i--;
-               alloc_size = vb->dma.sglist[i].length;
-               page = vb->dma.sglist[i].page;
+               alloc_size = sg_dma_len(&dma->sglist[i]);
+               page = sg_page(&dma->sglist[i]);
                do {
                        ClearPageReserved(page++);
                } while (alloc_size -= PAGE_SIZE);
-               __free_pages(vb->dma.sglist[i].page,
-                            get_order(vb->dma.sglist[i].length));
+               __free_pages(sg_page(&dma->sglist[i]),
+                            get_order(sg_dma_len(&dma->sglist[i])));
        }
 
-       kfree(vb->dma.sglist);
-       vb->dma.sglist = NULL;
+       kfree(dma->sglist);
+       dma->sglist = NULL;
 }
 
 /* Release all memory related to the videobuf_queue. */
@@ -282,15 +283,15 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
        size_t alloc_size, size = vb->bsize; /* vb->bsize is page aligned */
        struct page *page;
        int max_pages, err = 0, i = 0;
+       struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
 
        /*
         * allocate maximum size scatter-gather list. Note this is
         * overhead. We may not use as many entries as we allocate
         */
        max_pages = vb->bsize >> PAGE_SHIFT;
-       vb->dma.sglist =
-               kcalloc(max_pages, sizeof(*vb->dma.sglist), GFP_KERNEL);
-       if (vb->dma.sglist == NULL) {
+       dma->sglist = kcalloc(max_pages, sizeof(*dma->sglist), GFP_KERNEL);
+       if (dma->sglist == NULL) {
                err = -ENOMEM;
                goto out;
        }
@@ -318,9 +319,8 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
                size -= (PAGE_SIZE << order);
 
                /* append allocated chunk of pages into scatter-gather list */
-               vb->dma.sglist[i].page = page;
-               vb->dma.sglist[i].length = (PAGE_SIZE << order);
-               vb->dma.sglen++;
+               sg_set_page(&dma->sglist[i], page, PAGE_SIZE << order, 0);
+               dma->sglen++;
                i++;
 
                alloc_size = (PAGE_SIZE << order);
@@ -337,8 +337,8 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
         * REVISIT: not fully correct to assign nr_pages == sglen but
         * video-buf is passing nr_pages for e.g. unmap_sg calls
         */
-       vb->dma.nr_pages = vb->dma.sglen;
-       vb->dma.direction = PCI_DMA_FROMDEVICE;
+       dma->nr_pages = dma->sglen;
+       dma->direction = PCI_DMA_FROMDEVICE;
 
        return 0;
 
@@ -361,7 +361,7 @@ static int omap24xxcam_vbq_alloc_mmap_buffers(struct videobuf_queue *vbq,
                if (err)
                        goto out;
                dev_dbg(fh->cam->dev, "sglen is %d for buffer %d\n",
-                       vbq->bufs[i]->dma.sglen, i);
+                       videobuf_to_dma(vbq->bufs[i])->sglen, i);
        }
 
        mutex_unlock(&vbq->lock);
@@ -415,7 +415,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma,
 static void omap24xxcam_vbq_release(struct videobuf_queue *vbq,
                                    struct videobuf_buffer *vb)
 {
-       struct videobuf_dmabuf *dma = &vb->dma;
+       struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
 
        /* wait for buffer, especially to get out of the sgdma queue */
        videobuf_waiton(vb, 0, 0);
@@ -424,8 +424,8 @@ static void omap24xxcam_vbq_release(struct videobuf_queue *vbq,
                             dma->direction);
                dma->direction = DMA_NONE;
        } else {
-               videobuf_dma_unmap(vbq, &vb->dma);
-               videobuf_dma_free(&vb->dma);
+               videobuf_dma_unmap(vbq, videobuf_to_dma(vb));
+               videobuf_dma_free(videobuf_to_dma(vb));
        }
 
        vb->state = STATE_NEEDS_INIT;
@@ -525,7 +525,7 @@ static int omap24xxcam_vbq_prepare(struct videobuf_queue *vbq,
                         * we have built the scatter-gather list by ourself so
                         * do the scatter-gather mapping as well
                         */
-                       err = omap24xxcam_dma_iolock(vbq, &vb->dma);
+                       err = omap24xxcam_dma_iolock(vbq, videobuf_to_dma(vb));
                else
                        err = videobuf_iolock(vbq, vb, NULL);
        }
@@ -554,8 +554,9 @@ static void omap24xxcam_vbq_queue(struct videobuf_queue *vbq,
         */
        vb->state = STATE_ACTIVE;
 
-       err = omap24xxcam_sgdma_queue(&fh->cam->sgdma, vb->dma.sglist,
-                                     vb->dma.sglen, vb->size,
+       err = omap24xxcam_sgdma_queue(&fh->cam->sgdma,
+                                     videobuf_to_dma(vb)->sglist,
+                                     videobuf_to_dma(vb)->sglen, vb->size,
                                      omap24xxcam_vbq_complete, vb);
 
        if (!err) {
@@ -1087,10 +1088,10 @@ static int vidioc_reqbufs(struct file *file, void *fh,
         * Either videobuf_reqbufs failed or the buffers are not
         * memory-mapped (which would need special attention).
         */
-       if (rval || b->memory != V4L2_MEMORY_MMAP)
+       if (rval < 0 || b->memory != V4L2_MEMORY_MMAP)
                goto out;
 
-       rval = omap24xxcam_vbq_alloc_mmap_buffers(&ofh->vbq, b->count);
+       rval = omap24xxcam_vbq_alloc_mmap_buffers(&ofh->vbq, rval);
        if (rval)
                omap24xxcam_vbq_free_mmap_buffers(&ofh->vbq);
 
@@ -1366,7 +1367,6 @@ static int omap24xxcam_mmap_buffers(struct file *file,
        struct omap24xxcam_fh *fh = file->private_data;
        struct omap24xxcam_device *cam = fh->cam;
        struct videobuf_queue *vbq = &fh->vbq;
-       struct videobuf_buffer *vb;
        unsigned int first, last, size, i, j;
        int err = 0;
 
@@ -1401,15 +1401,16 @@ static int omap24xxcam_mmap_buffers(struct file *file,
 
        size = 0;
        for (i = first; i <= last; i++) {
-               vb = vbq->bufs[i];
-               for (j = 0; j < vb->dma.sglen; j++) {
+               struct videobuf_dmabuf *dma = videobuf_to_dma(vbq->bufs[i]);
+
+               for (j = 0; j < dma->sglen; j++) {
                        err = remap_pfn_range(
                                vma, vma->vm_start + size,
-                               page_to_pfn(vb->dma.sglist[j].page),
-                               vb->dma.sglist[j].length, vma->vm_page_prot);
+                               page_to_pfn(sg_page(&dma->sglist[j])),
+                               sg_dma_len(&dma->sglist[j]), vma->vm_page_prot);
                        if (err)
                                goto out;
-                       size += vb->dma.sglist[j].length;
+                       size += sg_dma_len(&dma->sglist[j]);
                }
        }
 
@@ -1483,10 +1484,10 @@ static int omap24xxcam_open(struct inode *inode, struct file *file)
 
        spin_lock_init(&fh->vbq_lock);
 
-       videobuf_queue_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
-                           &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                           V4L2_FIELD_NONE,
-                           sizeof(struct videobuf_buffer), fh);
+       videobuf_queue_pci_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
+                               &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+                               V4L2_FIELD_NONE,
+                               sizeof(struct videobuf_buffer), fh);
 
        return 0;
 
@@ -1634,8 +1635,6 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
 
        strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
        vfd->type                = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
-       /* need to register for a VID_HARDWARE_* ID in videodev.h */
-       vfd->hardware            = 0;
        vfd->fops                = &omap24xxcam_fops;
        vfd->priv                = cam;
        vfd->minor               = -1;

diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h
index 7799733e9fdfe9954439569a9929d47c613e45cf..00d0e318929b06d5eb5b1d07e8e51b1ca7015f1e 100644 (file)
--- a/drivers/media/video/omap24xxcam.h
+++ b/drivers/media/video/omap24xxcam.h
@@ -27,7 +27,7 @@
 #ifndef OMAP24XXCAM_H
 #define OMAP24XXCAM_H
 
-#include <media/video-buf.h>
+#include <media/videobuf-dma-sg.h>
 #include <media/v4l2-int-device.h>
 
 /*