* Patch "[media] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish" has been added to the 3.10-stable tree
@ 2016-02-13 22:50 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-02-13 22:50 UTC (permalink / raw)
To: tiffany.lin, gregkh, mchehab, sakari.ailus; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
[media] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-vb2-dma-contig-fully-cache-synchronise-buffers-in-prepare-and-finish.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From d9a985883fa32453d099d6293188c11d75cef1fa Mon Sep 17 00:00:00 2001
From: Tiffany Lin <tiffany.lin@mediatek.com>
Date: Thu, 24 Sep 2015 06:02:36 -0300
Subject: [media] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish
From: Tiffany Lin <tiffany.lin@mediatek.com>
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/media/v4l2-core/videobuf2-dma-contig.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- 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_pri
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);
}
/*********************************************/
Patches currently in stable-queue which might be from tiffany.lin@mediatek.com are
queue-3.10/media-vb2-dma-contig-fully-cache-synchronise-buffers-in-prepare-and-finish.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-02-13 22:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-13 22:50 Patch "[media] media: vb2 dma-contig: Fully cache synchronise buffers in prepare and finish" has been added to the 3.10-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.