Skip to content

Commit

Permalink
media: hantro: Fix .buf_prepare
Browse files Browse the repository at this point in the history
[ Upstream commit 082aaec ]

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 hantro_g1_h264_dec.c.

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
andrzejtp authored and gregkh committed Jul 14, 2021
1 parent 32d4f36 commit 1ef50a7
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/staging/media/hantro/hantro_v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,14 @@ static int hantro_buf_prepare(struct vb2_buffer *vb)
ret = hantro_buf_plane_check(vb, pix_fmt);
if (ret)
return ret;
vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);
/*
* Buffer's bytesused must be written by driver for CAPTURE buffers.
* (for OUTPUT buffers, if userspace passes 0 bytesused, v4l2-core sets
* it to buffer length).
*/
if (V4L2_TYPE_IS_CAPTURE(vq->type))
vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);

return 0;
}

Expand Down

0 comments on commit 1ef50a7

Please sign in to comment.