lkml.org 
[lkml]   [2015]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 050/164] [media] media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish
    Date
    3.19.8-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tiffany Lin <tiffany.lin@mediatek.com>

    commit 418dae2276065680bde7ae27d2c075e612a54de6 upstream.

    In videobuf2 dma-sg memory types the prepare and finish ops, instead
    of passing the number of entries in the original scatterlist as the
    "nents" parameter to dma_sync_sg_for_device() and dma_sync_sg_for_cpu(),
    the value returned by dma_map_sg() was used. Albeit this has been
    suggested in comments of some implementations (which have since been
    corrected), this is wrong.

    Fixes: d790b7eda953 ("vb2-dma-sg: move dma_(un)map_sg here")

    Signed-off-by: Tiffany Lin <tiffany.lin@mediatek.com>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/media/v4l2-core/videobuf2-dma-sg.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
    index b1838ab..91c6f56 100644
    --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
    +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
    @@ -209,7 +209,8 @@ static void vb2_dma_sg_prepare(void *buf_priv)
    if (buf->db_attach)
    return;

    - dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
    + dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
    + buf->dma_dir);
    }

    static void vb2_dma_sg_finish(void *buf_priv)
    @@ -221,7 +222,7 @@ static void vb2_dma_sg_finish(void *buf_priv)
    if (buf->db_attach)
    return;

    - dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
    + dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
    }

    static inline int vma_is_io(struct vm_area_struct *vma)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-02 19:21    [W:5.023 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site