lkml.org 
[lkml]   [2019]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 48/91] media: mx2_emmaprp: Correct return type for mem2mem buffer helpers
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 8d20dcefe471763f23ad538369ec65b51993ffff ]

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

    diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
    index e68d271b10af..8354ad20865a 100644
    --- a/drivers/media/platform/mx2_emmaprp.c
    +++ b/drivers/media/platform/mx2_emmaprp.c
    @@ -288,7 +288,7 @@ static void emmaprp_device_run(void *priv)
    {
    struct emmaprp_ctx *ctx = priv;
    struct emmaprp_q_data *s_q_data, *d_q_data;
    - struct vb2_buffer *src_buf, *dst_buf;
    + struct vb2_v4l2_buffer *src_buf, *dst_buf;
    struct emmaprp_dev *pcdev = ctx->dev;
    unsigned int s_width, s_height;
    unsigned int d_width, d_height;
    @@ -308,8 +308,8 @@ static void emmaprp_device_run(void *priv)
    d_height = d_q_data->height;
    d_size = d_width * d_height;

    - p_in = vb2_dma_contig_plane_dma_addr(src_buf, 0);
    - p_out = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
    + p_in = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
    + p_out = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
    if (!p_in || !p_out) {
    v4l2_err(&pcdev->v4l2_dev,
    "Acquiring kernel pointers to buffers failed\n");
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-04-04 11:56    [W:3.613 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site