1 files changed, 22 insertions, 28 deletions

diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 4f6bfba58065..6e933d383fa2 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -463,7 +463,6 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
         struct solo_dev *solo_dev = solo_enc->solo_dev;
         struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_size;
-        int ret;
 
         vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
 
@@ -473,22 +472,10 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
         frame_size = ALIGN(vop_jpeg_size(vh) + solo_enc->jpeg_len, DMA_ALIGN);
         vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len);
 
-        /* may discard all previous data in vbuf->sgl */
-        if (!dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE))
-                return -ENOMEM;
-        ret = solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
+        return solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
                              vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev),
                              frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
                              SOLO_JPEG_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE);
-
-        /* add the header only after dma_unmap_sg() */
-        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
-                            solo_enc->jpeg_header, solo_enc->jpeg_len);
-
-        return ret;
 }
 
 static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
@@ -498,7 +485,6 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
         struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_off, frame_size;
         int skip = 0;
-        int ret;
 
         if (vb2_plane_size(vb, 0) < vop_mpeg_size(vh))
                 return -EIO;
@@ -521,21 +507,9 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
                 sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
         frame_size = ALIGN(vop_mpeg_size(vh) + skip, DMA_ALIGN);
 
-        /* may discard all previous data in vbuf->sgl */
-        if (!dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE))
-                return -ENOMEM;
-        ret = solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
+        return solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
                         SOLO_MP4E_EXT_ADDR(solo_dev),
                         SOLO_MP4E_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE);
-
-        /* add the header only after dma_unmap_sg() */
-        if (!vop_type(vh))
-                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
-                                    solo_enc->vop, solo_enc->vop_len);
-        return ret;
 }
 
 static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
@@ -793,9 +767,29 @@ static void solo_enc_stop_streaming(struct vb2_queue *q)
         spin_unlock_irqrestore(&solo_enc->av_lock, flags);
 }
 
+static void solo_enc_buf_finish(struct vb2_buffer *vb)
+{
+        struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vb->vb2_queue);
+        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+
+        switch (solo_enc->fmt) {
+        case V4L2_PIX_FMT_MPEG4:
+        case V4L2_PIX_FMT_H264:
+                if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME)
+                        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                                        solo_enc->vop, solo_enc->vop_len);
+                break;
+        default: /* V4L2_PIX_FMT_MJPEG */
+                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                                solo_enc->jpeg_header, solo_enc->jpeg_len);
+                break;
+        }
+}
+
 static struct vb2_ops solo_enc_video_qops = {
         .queue_setup    = solo_enc_queue_setup,
         .buf_queue      = solo_enc_buf_queue,
+        .buf_finish     = solo_enc_buf_finish,
         .start_streaming = solo_enc_start_streaming,
         .stop_streaming = solo_enc_stop_streaming,
         .wait_prepare   = vb2_ops_wait_prepare,