[media] vb2-dma-sg: move dma_(un)map_sg here

This moves dma_(un)map_sg to the get_userptr/put_userptr and alloc/put
memops of videobuf2-dma-sg.c and adds dma_sync_sg_for_device/cpu to the
prepare/finish memops.

Now that vb2-dma-sg will sync the buffers for you in the prepare/finish
memops we can drop that from the drivers that use dma-sg.

For the solo6x10 driver that was a bit more involved because it needs to
copy JPEG or MPEG headers to the buffer before returning it to userspace,
and that cannot be done in the old place since the buffer there is still
setup for DMA access, not for CPU access. However, the buf_finish
op is the ideal place to do this. By the time buf_finish is called
the buffer is available for CPU access, so copying to the buffer is fine.

[mchehab@osg.samsung.com: Fix a compilation breakage:
 drivers/media/v4l2-core/videobuf2-dma-sg.c:150:19: error: 'struct vb2_dma_sg_buf' has no member named 'dma_sgt']

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>

1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index c3ff5388aeb3..ce00cbaf850e 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1220,17 +1220,12 @@ static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
 static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 {
         struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
-        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
         struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
         struct mcam_dma_desc *desc = mvb->dma_desc;
         struct scatterlist *sg;
         int i;
 
-        mvb->dma_desc_nent = dma_map_sg(cam->dev, sg_table->sgl,
-                        sg_table->nents, DMA_FROM_DEVICE);
-        if (mvb->dma_desc_nent <= 0)
-                return -EIO;  /* Not sure what's right here */
-        for_each_sg(sg_table->sgl, sg, mvb->dma_desc_nent, i) {
+        for_each_sg(sg_table->sgl, sg, sg_table->nents, i) {
                 desc->dma_addr = sg_dma_address(sg);
                 desc->segment_len = sg_dma_len(sg);
                 desc++;
@@ -1238,16 +1233,6 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
         return 0;
 }
 
-static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
-{
-        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
-        struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
-
-        if (sg_table)
-                dma_unmap_sg(cam->dev, sg_table->sgl,
-                                sg_table->nents, DMA_FROM_DEVICE);
-}
-
 static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
 {
         struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
@@ -1264,7 +1249,6 @@ static const struct vb2_ops mcam_vb2_sg_ops = {
         .buf_init               = mcam_vb_sg_buf_init,
         .buf_prepare            = mcam_vb_sg_buf_prepare,
         .buf_queue              = mcam_vb_buf_queue,
-        .buf_finish             = mcam_vb_sg_buf_finish,
         .buf_cleanup            = mcam_vb_sg_buf_cleanup,
         .start_streaming        = mcam_vb_start_streaming,
         .stop_streaming         = mcam_vb_stop_streaming,