releases/4.19.34/media-rockchip-rga-correct-return-type-for-mem2mem-b.patch

   1 From cb7b2244b032996bf12854f20312ff85bbaea1d2 Mon Sep 17 00:00:00 2001
   2 From: Ezequiel Garcia <ezequiel@collabora.com>
   3 Date: Fri, 8 Feb 2019 11:17:43 -0500
   4 Subject: media: rockchip/rga: Correct return type for mem2mem buffer helpers
   5
   6 [ Upstream commit da2d3a4e4adabc6ccfb100bc9abd58ee9cd6c4b7 ]
   7
   8 Fix the assigned type of mem2mem buffer handling API.
   9 Namely, these functions:
  10
  11  v4l2_m2m_next_buf
  12  v4l2_m2m_last_buf
  13  v4l2_m2m_buf_remove
  14  v4l2_m2m_next_src_buf
  15  v4l2_m2m_next_dst_buf
  16  v4l2_m2m_last_src_buf
  17  v4l2_m2m_last_dst_buf
  18  v4l2_m2m_src_buf_remove
  19  v4l2_m2m_dst_buf_remove
  20
  21 return a struct vb2_v4l2_buffer, and not a struct vb2_buffer.
  22
  23 Fixing this is necessary to fix the mem2mem buffer handling API,
  24 changing the return to the correct struct vb2_v4l2_buffer instead
  25 of a void pointer.
  26
  27 Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
  28 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  29 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  30 Signed-off-by: Sasha Levin <sashal@kernel.org>
  31 ---
  32  drivers/media/platform/rockchip/rga/rga.c | 6 +++---
  33  1 file changed, 3 insertions(+), 3 deletions(-)
  34
  35 diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
  36 index ab5a6f95044a..86a76f35a9a1 100644
  37 --- a/drivers/media/platform/rockchip/rga/rga.c
  38 +++ b/drivers/media/platform/rockchip/rga/rga.c
  39 @@ -43,7 +43,7 @@ static void device_run(void *prv)
  40  {
  41         struct rga_ctx *ctx = prv;
  42         struct rockchip_rga *rga = ctx->rga;
  43 -       struct vb2_buffer *src, *dst;
  44 +       struct vb2_v4l2_buffer *src, *dst;
  45         unsigned long flags;
  46
  47         spin_lock_irqsave(&rga->ctrl_lock, flags);
  48 @@ -53,8 +53,8 @@ static void device_run(void *prv)
  49         src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
  50         dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
  51
  52 -       rga_buf_map(src);
  53 -       rga_buf_map(dst);
  54 +       rga_buf_map(&src->vb2_buf);
  55 +       rga_buf_map(&dst->vb2_buf);
  56
  57         rga_hw_start(rga);
  58
  59 --
  60 2.19.1
  61