Commit 418dae22 authored Sep 24, 2015 by Tiffany Lin Committed by Mauro Carvalho Chehab Oct 20, 2015

[media] media: vb2 dma-sg: Fully cache synchronise buffers in prepare and finish



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: d790b7ed ("vb2-dma-sg: move dma_(un)map_sg here")

Cc: stable@vger.kernel.org # for v3.19 and up
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>

parent d9a98588

drivers/media/v4l2-core/videobuf2-dma-sg.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -210,7 +210,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)
		@@ -222,7 +223,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 void vb2_dma_sg_get_userptr(void alloc_ctx, unsigned long vaddr,