Commit 73a4cc59 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Greg Kroah-Hartman

media: s5p-g2d: Correct return type for mem2mem buffer helpers

[ Upstream commit 30fa627b ]

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: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3c6cd079
...@@ -487,7 +487,7 @@ static void device_run(void *prv) ...@@ -487,7 +487,7 @@ static void device_run(void *prv)
{ {
struct g2d_ctx *ctx = prv; struct g2d_ctx *ctx = prv;
struct g2d_dev *dev = ctx->dev; struct g2d_dev *dev = ctx->dev;
struct vb2_buffer *src, *dst; struct vb2_v4l2_buffer *src, *dst;
unsigned long flags; unsigned long flags;
u32 cmd = 0; u32 cmd = 0;
...@@ -502,10 +502,10 @@ static void device_run(void *prv) ...@@ -502,10 +502,10 @@ static void device_run(void *prv)
spin_lock_irqsave(&dev->ctrl_lock, flags); spin_lock_irqsave(&dev->ctrl_lock, flags);
g2d_set_src_size(dev, &ctx->in); 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_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_rop4(dev, ctx->rop);
g2d_set_flip(dev, ctx->flip); g2d_set_flip(dev, ctx->flip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment