lkml.org 
[lkml]   [2016]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 026/142] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish
    Date
    From: Tiffany Lin <tiffany.lin@mediatek.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit d9a985883fa32453d099d6293188c11d75cef1fa upstream.

    In videobuf2 dma-contig memory type 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: 199d101efdba ("v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator")

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/media/v4l2-core/videobuf2-dma-contig.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
    index 646f08f4f504..a833c67df62e 100644
    --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
    +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
    @@ -117,7 +117,8 @@ static void vb2_dc_prepare(void *buf_priv)
    if (!sgt || 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_dc_finish(void *buf_priv)
    @@ -129,7 +130,7 @@ static void vb2_dc_finish(void *buf_priv)
    if (!sgt || 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);
    }

    /*********************************************/
    --
    2.7.1
    \
     
     \ /
      Last update: 2016-02-24 12:41    [W:4.042 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site