Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / videobuf-dma-sg.c

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 0939ede831ab3fac8c36e3e746abbec27e12f450..3eb6123227b2277225dabb51bbe62c9963ad26a6 100644 (file)
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -134,8 +134,8 @@ void videobuf_dma_init(struct videobuf_dmabuf *dma)
        dma->magic = MAGIC_DMABUF;
 }
 
-int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
-                          unsigned long data, unsigned long size)
+static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,
+                       int direction, unsigned long data, unsigned long size)
 {
        unsigned long first,last;
        int err, rw = 0;
@@ -160,12 +160,12 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
 
        dma->varea = (void *) data;
 
-       down_read(&current->mm->mmap_sem);
+
        err = get_user_pages(current,current->mm,
                             data & PAGE_MASK, dma->nr_pages,
                             rw == READ, 1, /* force */
                             dma->pages, NULL);
-       up_read(&current->mm->mmap_sem);
+
        if (err != dma->nr_pages) {
                dma->nr_pages = (err >= 0) ? err : 0;
                dprintk(1,"get_user_pages: err=%d [%d]\n",err,dma->nr_pages);
@@ -174,6 +174,17 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
        return 0;
 }
 
+int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
+                          unsigned long data, unsigned long size)
+{
+       int ret;
+       down_read(&current->mm->mmap_sem);
+       ret = videobuf_dma_init_user_locked(dma, direction, data, size);
+       up_read(&current->mm->mmap_sem);
+
+       return ret;
+}
+
 int videobuf_dma_init_kernel(struct videobuf_dmabuf *dma, int direction,
                             int nr_pages)
 {
@@ -209,7 +220,6 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction,
 int videobuf_dma_map(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 {
        void                   *dev=q->dev;
-       struct videobuf_dma_sg_ops *ops=q->priv_ops;
 
        MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
        BUG_ON(0 == dma->nr_pages);
@@ -236,10 +246,8 @@ int videobuf_dma_map(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
                return -ENOMEM;
        }
        if (!dma->bus_addr) {
-               if (ops && ops->vb_map_sg) {
-                       dma->sglen = ops->vb_map_sg(dev,dma->sglist,
+               dma->sglen = pci_map_sg(dev,dma->sglist,
                                        dma->nr_pages, dma->direction);
-               }
                if (0 == dma->sglen) {
                        printk(KERN_WARNING
                               "%s: videobuf_map_sg failed\n",__FUNCTION__);
@@ -255,30 +263,24 @@ int videobuf_dma_map(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 int videobuf_dma_sync(struct videobuf_queue *q,struct videobuf_dmabuf *dma)
 {
        void                   *dev=q->dev;
-       struct videobuf_dma_sg_ops *ops=q->priv_ops;
 
        MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
        BUG_ON(!dma->sglen);
 
-       if (!dma->bus_addr && ops && ops->vb_dma_sync_sg)
-               ops->vb_dma_sync_sg(dev,dma->sglist,dma->nr_pages,
-                                                       dma->direction);
-
+       pci_dma_sync_sg_for_cpu (dev,dma->sglist,dma->nr_pages,dma->direction);
        return 0;
 }
 
 int videobuf_dma_unmap(struct videobuf_queue* q,struct videobuf_dmabuf *dma)
 {
        void                   *dev=q->dev;
-       struct videobuf_dma_sg_ops *ops=q->priv_ops;
 
        MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
        if (!dma->sglen)
                return 0;
 
-       if (!dma->bus_addr && ops && ops->vb_unmap_sg)
-                       ops->vb_unmap_sg(dev,dma->sglist,dma->nr_pages,
-                                                       dma->direction);
+       pci_unmap_sg (dev,dma->sglist,dma->nr_pages,dma->direction);
+
        kfree(dma->sglist);
        dma->sglist = NULL;
        dma->sglen = 0;
@@ -314,12 +316,8 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
 int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma)
 {
        struct videobuf_queue q;
-       struct videobuf_dma_sg_ops qops;
 
        q.dev=pci;
-       qops.vb_map_sg=(vb_map_sg_t *)pci_map_sg;
-       qops.vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;
-       q.priv_ops = &qops;
 
        return (videobuf_dma_map(&q,dma));
 }
@@ -327,12 +325,8 @@ int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma)
 int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma)
 {
        struct videobuf_queue q;
-       struct videobuf_dma_sg_ops qops;
 
        q.dev=pci;
-       qops.vb_map_sg=(vb_map_sg_t *)pci_map_sg;
-       qops.vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;
-       q.priv_ops = &qops;
 
        return (videobuf_dma_unmap(&q,dma));
 }
@@ -469,13 +463,24 @@ static int __videobuf_iolock (struct videobuf_queue* q,
                                                        pages );
                        if (0 != err)
                                return err;
-               } else {
+               } else if (vb->memory == V4L2_MEMORY_USERPTR) {
                        /* dma directly to userspace */
                        err = videobuf_dma_init_user( &mem->dma,
                                                      PCI_DMA_FROMDEVICE,
                                                      vb->baddr,vb->bsize );
                        if (0 != err)
                                return err;
+               } else {
+                       /* NOTE: HACK: videobuf_iolock on V4L2_MEMORY_MMAP
+                       buffers can only be called from videobuf_qbuf
+                       we take current->mm->mmap_sem there, to prevent
+                       locking inversion, so don't take it here */
+
+                       err = videobuf_dma_init_user_locked(&mem->dma,
+                                                     PCI_DMA_FROMDEVICE,
+                                                     vb->baddr, vb->bsize);
+                       if (0 != err)
+                               return err;
                }
                break;
        case V4L2_MEMORY_OVERLAY:
@@ -665,7 +670,7 @@ static struct videobuf_qtype_ops pci_ops = {
        .sync         = __videobuf_sync,
        .mmap_free    = __videobuf_mmap_free,
        .mmap_mapper  = __videobuf_mmap_mapper,
-       .copy_to_user = __videobuf_copy_to_user,
+       .video_copy_to_user = __videobuf_copy_to_user,
        .copy_stream  = __videobuf_copy_stream,
 };
 
@@ -690,46 +695,10 @@ void videobuf_queue_pci_init(struct videobuf_queue* q,
                         unsigned int msize,
                         void *priv)
 {
-       struct videobuf_dma_sg_ops *priv_ops;
-
-       videobuf_queue_init(q, ops, dev, irqlock, type, field, msize, priv);
-       q->int_ops=&pci_ops;
-
-       /* FIXME: the code bellow should be removed after having a proper
-        * memory allocation method for vivi and tm6000
-        */
-       q->priv_ops= kzalloc(sizeof(struct videobuf_dma_sg_ops), GFP_KERNEL);
-       BUG_ON (!q->priv_ops);
-
-       priv_ops=q->priv_ops;
-
-       /* Sets default methods for handling Scatter Gather mapping */
-       priv_ops->vb_map_sg=(vb_map_sg_t *)pci_map_sg;
-       priv_ops->vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;
-       priv_ops->vb_dma_sync_sg=(vb_map_sg_t *)pci_dma_sync_sg_for_cpu;
+       videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize,
+                                priv, &pci_ops);
 }
 
-void videobuf_set_pci_ops (struct videobuf_queue* q,
-                               struct videobuf_dma_sg_ops *ops)
-{
-       kfree (q->priv_ops);
-
-       q->priv_ops=ops;
-
-       if (!ops)
-               return;
-
-       /* If not specified, defaults to PCI map sg */
-       if (!ops->vb_map_sg)
-               ops->vb_map_sg=(vb_map_sg_t *)pci_map_sg;
-
-       if (!ops->vb_dma_sync_sg)
-               ops->vb_dma_sync_sg=(vb_map_sg_t *)pci_dma_sync_sg_for_cpu;
-       if (!ops->vb_unmap_sg)
-               ops->vb_unmap_sg=(vb_map_sg_t *)pci_unmap_sg;
-}
-
-
 /* --------------------------------------------------------------------- */
 
 EXPORT_SYMBOL_GPL(videobuf_vmalloc_to_sg);
@@ -749,7 +718,6 @@ EXPORT_SYMBOL_GPL(videobuf_pci_dma_unmap);
 EXPORT_SYMBOL_GPL(videobuf_pci_alloc);
 
 EXPORT_SYMBOL_GPL(videobuf_queue_pci_init);
-EXPORT_SYMBOL_GPL(videobuf_set_pci_ops);
 
 /*
  * Local variables: