Re: [PATCH] Revert "media: videobuf2: Fix length check for single plane dmabuf queueing"

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

On Wed, Jan 06, 2021 at 02:35:22PM +0000, Kieran Bingham wrote:
> Hi Naush,
> 
> On 06/01/2021 13:52, Naushir Patuck wrote:
> > The updated length check for dmabuf types broke existing usage in v4l2
> > userland clients.
> 
> Indeed, my tests have indeed been failing since 5.8 or such it seems.
> 
> Thank you for this - it fixes the tests again for me.
> 
> Tested-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Cc: stable@vger.kernel.org

?

> > Fixes: 961d3b27 ("media: videobuf2: Fix length check for single plane dmabuf queueing")
> > Signed-off-by: Naushir Patuck <naush@raspberrypi.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