* [PATCH v2] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
[not found] <20210106135210.12337-1-naush@raspberrypi.com>
@ 2021-01-06 15:16 ` Naushir Patuck
2021-01-06 15:25 ` Laurent Pinchart
0 siblings, 1 reply; 2+ messages in thread
From: Naushir Patuck @ 2021-01-06 15:16 UTC (permalink / raw)
To: linux-media; +Cc: laurent.pinchart, Naushir Patuck, stable, Kieran Bingham
The updated length check for dmabuf types broke existing usage in v4l2
userland clients.
Fixes: 961d3b27 ("media: videobuf2: Fix length check for single plane dmabuf queueing")
Cc: stable@vger.kernel.org
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
---
drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 96d3b2b2aa31..3f61f5863bf7 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
return -EINVAL;
}
} else {
- length = (b->memory == VB2_MEMORY_USERPTR ||
- b->memory == VB2_MEMORY_DMABUF)
+ length = (b->memory == VB2_MEMORY_USERPTR)
? b->length : vb->planes[0].length;
if (b->bytesused > length)
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"
2021-01-06 15:16 ` [PATCH v2] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing" Naushir Patuck
@ 2021-01-06 15:25 ` Laurent Pinchart
0 siblings, 0 replies; 2+ messages in thread
From: Laurent Pinchart @ 2021-01-06 15:25 UTC (permalink / raw)
To: Naushir Patuck
Cc: linux-media, stable, Kieran Bingham, John Cox, Hans Verkuil
Hi Naush,
Thank you for the patch.
(CC'ing John Cox as the author of the commit being reverted, and Hans
Verkuil as he has merged it)
On Wed, Jan 06, 2021 at 03:16:57PM +0000, Naushir Patuck wrote:
> The updated length check for dmabuf types broke existing usage in v4l2
> userland clients.
>
> Fixes: 961d3b27 ("media: videobuf2: Fix length check for single plane dmabuf queueing")
> Cc: stable@vger.kernel.org
> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
> Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> index 96d3b2b2aa31..3f61f5863bf7 100644
> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> @@ -118,8 +118,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
> return -EINVAL;
> }
> } else {
> - length = (b->memory == VB2_MEMORY_USERPTR ||
> - b->memory == VB2_MEMORY_DMABUF)
> + length = (b->memory == VB2_MEMORY_USERPTR)
> ? b->length : vb->planes[0].length;
>
> if (b->bytesused > length)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-06 15:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210106135210.12337-1-naush@raspberrypi.com>
2021-01-06 15:16 ` [PATCH v2] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing" Naushir Patuck
2021-01-06 15:25 ` Laurent Pinchart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox