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 4.4 33/63] media: s5p-g2d: Correct return type for mem2mem buffer helpers
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit 30fa627b32230737bc3f678067e2adfecf956987 ]

    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/s5p-g2d/g2d.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
    index e1936d9d27da..2b939555cccb 100644
    --- a/drivers/media/platform/s5p-g2d/g2d.c
    +++ b/drivers/media/platform/s5p-g2d/g2d.c
    @@ -497,7 +497,7 @@ static void device_run(void *prv)
    {
    struct g2d_ctx *ctx = prv;
    struct g2d_dev *dev = ctx->dev;
    - struct vb2_buffer *src, *dst;
    + struct vb2_v4l2_buffer *src, *dst;
    unsigned long flags;
    u32 cmd = 0;

    @@ -512,10 +512,10 @@ static void device_run(void *prv)
    spin_lock_irqsave(&dev->ctrl_lock, flags);

    g2d_set_src_size(dev, &ctx->in);
    - g2d_set_src_addr(dev, vb2_dma_contig_plane_dma_addr(src, 0));
    + g2d_set_src_addr(dev, vb2_dma_contig_plane_dma_addr(&src->vb2_buf, 0));

    g2d_set_dst_size(dev, &ctx->out);
    - g2d_set_dst_addr(dev, vb2_dma_contig_plane_dma_addr(dst, 0));
    + g2d_set_dst_addr(dev, vb2_dma_contig_plane_dma_addr(&dst->vb2_buf, 0));

    g2d_set_rop4(dev, ctx->rop);
    g2d_set_flip(dev, ctx->flip);
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 19:36    [W:3.031 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site