The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 03703ed1debf777ea845aa9b50ba2e80a5e7dd3c Mon Sep 17 00:00:00 2001
From: Sakari Ailus sakari.ailus@linux.intel.com Date: Fri, 2 Feb 2018 05:08:59 -0500 Subject: [PATCH] media: vb2: core: Finish buffers at the end of the stream
If buffers were prepared or queued and the buffers were released without starting the queue, the finish mem op (corresponding to the prepare mem op) was never called to the buffers.
Before commit a136f59c0a1f there was no need to do this as in such a case the prepare mem op had not been called yet. Address the problem by explicitly calling finish mem op when the queue is stopped if the buffer is in either prepared or queued state.
Fixes: a136f59c0a1f ("[media] vb2: Move buffer cache synchronisation to prepare from queue")
Cc: stable@vger.kernel.org # for v4.13 and up Signed-off-by: Sakari Ailus sakari.ailus@linux.intel.com Tested-by: Devin Heitmueller dheitmueller@kernellabs.com Signed-off-by: Hans Verkuil hans.verkuil@cisco.com Signed-off-by: Mauro Carvalho Chehab mchehab@s-opensource.com
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index debe35fc66b4..d3f7bb33a54d 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -1696,6 +1696,15 @@ static void __vb2_queue_cancel(struct vb2_queue *q) for (i = 0; i < q->num_buffers; ++i) { struct vb2_buffer *vb = q->bufs[i];
+ if (vb->state == VB2_BUF_STATE_PREPARED || + vb->state == VB2_BUF_STATE_QUEUED) { + unsigned int plane; + + for (plane = 0; plane < vb->num_planes; ++plane) + call_void_memop(vb, finish, + vb->planes[plane].mem_priv); + } + if (vb->state != VB2_BUF_STATE_DEQUEUED) { vb->state = VB2_BUF_STATE_PREPARED; call_void_vb_qop(vb, buf_finish, vb);
Hi Greg,
On Thu, Apr 19, 2018 at 06:23:24PM +0200, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
The attached backported patch should now apply to v4.14-stable. Backported by changing the path of the file. It was in a different location in v4.14.x
-- Regards Sudip
On Thu, Jul 05, 2018 at 09:29:43PM +0100, Sudip Mukherjee wrote:
Hi Greg,
On Thu, Apr 19, 2018 at 06:23:24PM +0200, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
The attached backported patch should now apply to v4.14-stable. Backported by changing the path of the file. It was in a different location in v4.14.x
Ah, I should have caught that, thanks for the backport, now applied.
greg k-h
On Tue, Jul 10, 2018 at 03:57:01PM +0200, Greg KH wrote:
On Thu, Jul 05, 2018 at 09:29:43PM +0100, Sudip Mukherjee wrote:
Hi Greg,
On Thu, Apr 19, 2018 at 06:23:24PM +0200, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
The attached backported patch should now apply to v4.14-stable. Backported by changing the path of the file. It was in a different location in v4.14.x
Ah, I should have caught that, thanks for the backport, now applied.
Thanks a lot!
linux-stable-mirror@lists.linaro.org