[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>

2 files changed, 13 insertions, 1 deletions

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index f0eeb6cd262c..c3ff5388aeb3 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1079,6 +1079,8 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
                 *nbufs = minbufs;
         if (cam->buffer_mode == B_DMA_contig)
                 alloc_ctxs[0] = cam->vb_alloc_ctx;
+        else if (cam->buffer_mode == B_DMA_sg)
+                alloc_ctxs[0] = cam->vb_alloc_ctx_sg;
         return 0;
 }
 
@@ -1286,10 +1288,12 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
                 vq->ops = &mcam_vb2_ops;
                 vq->mem_ops = &vb2_dma_contig_memops;
                 vq->buf_struct_size = sizeof(struct mcam_vb_buffer);
-                cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
                 vq->io_modes = VB2_MMAP | VB2_USERPTR;
                 cam->dma_setup = mcam_ctlr_dma_contig;
                 cam->frame_complete = mcam_dma_contig_done;
+                cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
+                if (IS_ERR(cam->vb_alloc_ctx))
+                        return PTR_ERR(cam->vb_alloc_ctx);
 #endif
                 break;
         case B_DMA_sg:
@@ -1300,6 +1304,9 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
                 vq->io_modes = VB2_MMAP | VB2_USERPTR;
                 cam->dma_setup = mcam_ctlr_dma_sg;
                 cam->frame_complete = mcam_dma_sg_done;
+                cam->vb_alloc_ctx_sg = vb2_dma_sg_init_ctx(cam->dev);
+                if (IS_ERR(cam->vb_alloc_ctx_sg))
+                        return PTR_ERR(cam->vb_alloc_ctx_sg);
 #endif
                 break;
         case B_vmalloc:
@@ -1325,6 +1332,10 @@ static void mcam_cleanup_vb2(struct mcam_camera *cam)
         if (cam->buffer_mode == B_DMA_contig)
                 vb2_dma_contig_cleanup_ctx(cam->vb_alloc_ctx);
 #endif
+#ifdef MCAM_MODE_DMA_SG
+        if (cam->buffer_mode == B_DMA_sg)
+                vb2_dma_sg_cleanup_ctx(cam->vb_alloc_ctx_sg);
+#endif
 }
 
 
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index 60a8e1cfeff7..aa0c6eac254a 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -176,6 +176,7 @@ struct mcam_camera {
         /* DMA buffers - DMA modes */
         struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS];
         struct vb2_alloc_ctx *vb_alloc_ctx;
+        struct vb2_alloc_ctx *vb_alloc_ctx_sg;
 
         /* Mode-specific ops, set at open time */
         void (*dma_setup)(struct mcam_camera *cam);