lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 122/262] media: rockchip/rga: Correct return type for mem2mem buffer helpers
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit da2d3a4e4adabc6ccfb100bc9abd58ee9cd6c4b7 ]

    Fix the assigned type of mem2mem buffer handling API.
    Namely, these functions:

    v4l2_m2m_next_buf
    v4l2_m2m_last_buf
    v4l2_m2m_buf_remove
    v4l2_m2m_next_src_buf
    v4l2_m2m_next_dst_buf
    v4l2_m2m_last_src_buf
    v4l2_m2m_last_dst_buf
    v4l2_m2m_src_buf_remove
    v4l2_m2m_dst_buf_remove

    return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.

    Fixing this is necessary to fix the mem2mem buffer handling API,
    changing the return to the correct struct vb2_v4l2_buffer instead
    of a void pointer.

    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/rockchip/rga/rga.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
    index 5c653287185f..b096227a9722 100644
    --- a/drivers/media/platform/rockchip/rga/rga.c
    +++ b/drivers/media/platform/rockchip/rga/rga.c
    @@ -43,7 +43,7 @@ static void device_run(void *prv)
    {
    struct rga_ctx *ctx = prv;
    struct rockchip_rga *rga = ctx->rga;
    - struct vb2_buffer *src, *dst;
    + struct vb2_v4l2_buffer *src, *dst;
    unsigned long flags;

    spin_lock_irqsave(&rga->ctrl_lock, flags);
    @@ -53,8 +53,8 @@ static void device_run(void *prv)
    src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
    dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

    - rga_buf_map(src);
    - rga_buf_map(dst);
    + rga_buf_map(&src->vb2_buf);
    + rga_buf_map(&dst->vb2_buf);

    rga_hw_start(rga);

    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 20:25    [W:4.259 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site