]>
Commit | Line | Data |
---|---|---|
04fd09d4 SL |
1 | From 5315596d45b29c12dd5c52332d858f0e15a64802 Mon Sep 17 00:00:00 2001 |
2 | From: Ezequiel Garcia <ezequiel@collabora.com> | |
3 | Date: Fri, 8 Feb 2019 11:17:44 -0500 | |
4 | Subject: media: s5p-g2d: Correct return type for mem2mem buffer helpers | |
5 | ||
6 | [ Upstream commit 30fa627b32230737bc3f678067e2adfecf956987 ] | |
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/s5p-g2d/g2d.c | 6 +++--- | |
33 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
34 | ||
35 | diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c | |
36 | index 66aa8cf1d048..770100d40372 100644 | |
37 | --- a/drivers/media/platform/s5p-g2d/g2d.c | |
38 | +++ b/drivers/media/platform/s5p-g2d/g2d.c | |
39 | @@ -498,7 +498,7 @@ static void device_run(void *prv) | |
40 | { | |
41 | struct g2d_ctx *ctx = prv; | |
42 | struct g2d_dev *dev = ctx->dev; | |
43 | - struct vb2_buffer *src, *dst; | |
44 | + struct vb2_v4l2_buffer *src, *dst; | |
45 | unsigned long flags; | |
46 | u32 cmd = 0; | |
47 | ||
48 | @@ -513,10 +513,10 @@ static void device_run(void *prv) | |
49 | spin_lock_irqsave(&dev->ctrl_lock, flags); | |
50 | ||
51 | g2d_set_src_size(dev, &ctx->in); | |
52 | - g2d_set_src_addr(dev, vb2_dma_contig_plane_dma_addr(src, 0)); | |
53 | + g2d_set_src_addr(dev, vb2_dma_contig_plane_dma_addr(&src->vb2_buf, 0)); | |
54 | ||
55 | g2d_set_dst_size(dev, &ctx->out); | |
56 | - g2d_set_dst_addr(dev, vb2_dma_contig_plane_dma_addr(dst, 0)); | |
57 | + g2d_set_dst_addr(dev, vb2_dma_contig_plane_dma_addr(&dst->vb2_buf, 0)); | |
58 | ||
59 | g2d_set_rop4(dev, ctx->rop); | |
60 | g2d_set_flip(dev, ctx->flip); | |
61 | -- | |
62 | 2.19.1 | |
63 |