[media] vb2-dma-sg: add allocation context to dma-sg

Require that dma-sg also uses an allocation context. This is in preparation
for adding prepare/finish memops to sync the memory between DMA and CPU.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

3 files changed, 14 insertions, 3 deletions

diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
index 63f0b64057cb..c135165a8b26 100644
--- a/drivers/media/pci/tw68/tw68-core.c
+++ b/drivers/media/pci/tw68/tw68-core.c
@@ -304,13 +304,19 @@ static int tw68_initdev(struct pci_dev *pci_dev,
         /* Then do any initialisation wanted before interrupts are on */
         tw68_hw_init1(dev);
 
+        dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
+        if (IS_ERR(dev->alloc_ctx)) {
+                err = PTR_ERR(dev->alloc_ctx);
+                goto fail3;
+        }
+
         /* get irq */
         err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,
                           IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 pr_err("%s: can't get IRQ %d\n",
                        dev->name, pci_dev->irq);
-                goto fail3;
+                goto fail4;
         }
 
         /*
@@ -324,7 +330,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,
         if (err < 0) {
                 pr_err("%s: can't register video device\n",
                        dev->name);
-                goto fail4;
+                goto fail5;
         }
         tw_setl(TW68_INTMASK, dev->pci_irqmask);
 
@@ -333,8 +339,10 @@ static int tw68_initdev(struct pci_dev *pci_dev,
 
         return 0;
 
-fail4:
+fail5:
         video_unregister_device(&dev->vdev);
+fail4:
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
 fail3:
         iounmap(dev->lmmio);
 fail2:
@@ -358,6 +366,7 @@ static void tw68_finidev(struct pci_dev *pci_dev)
         /* unregister */
         video_unregister_device(&dev->vdev);
         v4l2_ctrl_handler_free(&dev->hdl);
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
 
         /* release resources */
         iounmap(dev->lmmio);
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 5c94ac7c88d9..50dcce6251f6 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -384,6 +384,7 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         unsigned tot_bufs = q->num_buffers + *num_buffers;
 
         sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
+        alloc_ctxs[0] = dev->alloc_ctx;
         /*
          * We allow create_bufs, but only if the sizeimage is the same as the
          * current sizeimage. The tw68_buffer_count calculation becomes quite
diff --git a/drivers/media/pci/tw68/tw68.h b/drivers/media/pci/tw68/tw68.h
index 2c8abe26b13b..7a7501bd165f 100644
--- a/drivers/media/pci/tw68/tw68.h
+++ b/drivers/media/pci/tw68/tw68.h
@@ -181,6 +181,7 @@ struct tw68_dev {
         unsigned                field;
         struct vb2_queue        vidq;
         struct list_head        active;
+        void                    *alloc_ctx;
 
         /* various v4l controls */
         const struct tw68_tvnorm *tvnorm;       /* video */