Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: rkvdec: Fix .buf_prepare

The driver should only set the payload on .buf_prepare if the
buffer is CAPTURE type. If an OUTPUT buffer has a zero bytesused
set by userspace then v4l2-core will set it to buffer length.

If we overwrite bytesused for OUTPUT buffers, too, then
vb2_get_plane_payload() will return incorrect value which might be then
written to hw registers by the driver in rkvdec-h264.c.

[Changed the comment and used V4L2_TYPE_IS_CAPTURE macro]

Fixes: cd33c830448ba ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Ezequiel Garcia and committed by
Mauro Carvalho Chehab
ba1ed4ae ac568863

+9 -1
+9 -1
drivers/staging/media/rkvdec/rkvdec.c
··· 481 481 if (vb2_plane_size(vb, i) < sizeimage) 482 482 return -EINVAL; 483 483 } 484 - vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage); 484 + 485 + /* 486 + * Buffer's bytesused must be written by driver for CAPTURE buffers. 487 + * (for OUTPUT buffers, if userspace passes 0 bytesused, v4l2-core sets 488 + * it to buffer length). 489 + */ 490 + if (V4L2_TYPE_IS_CAPTURE(vq->type)) 491 + vb2_set_plane_payload(vb, 0, f->fmt.pix_mp.plane_fmt[0].sizeimage); 492 + 485 493 return 0; 486 494 } 487 495