lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 238/667] media: hantro: Empty encoder capture buffers by default
    Date
    From: Chen-Yu Tsai <wenst@chromium.org>

    [ Upstream commit 309373a3571ef7175bd9da0c9b13476a718e8478 ]

    The payload size for encoder capture buffers is set by the driver upon
    finishing encoding each frame, based on the encoded length returned from
    hardware, and whatever header and padding length used. Setting a
    non-zero default serves no real purpose, and also causes issues if the
    capture buffer is returned to userspace unused, confusing the
    application.

    Instead, always set the payload size to 0 for encoder capture buffers
    when preparing them.

    Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver")
    Fixes: 082aaecff35f ("media: hantro: Fix .buf_prepare")
    Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
    Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/hantro/hantro_v4l2.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c
    index bcb0bdff4a9a..629bf40a5e5c 100644
    --- a/drivers/staging/media/hantro/hantro_v4l2.c
    +++ b/drivers/staging/media/hantro/hantro_v4l2.c
    @@ -647,8 +647,12 @@ static int hantro_buf_prepare(struct vb2_buffer *vb)
    * (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);
    + if (V4L2_TYPE_IS_CAPTURE(vq->type)) {
    + if (ctx->is_encoder)
    + vb2_set_plane_payload(vb, 0, 0);
    + else
    + vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);
    + }

    return 0;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 20:47    [W:2.370 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site