]>
Commit | Line | Data |
---|---|---|
f688f459 SL |
1 | From 72e63c0e4f2884e166d67c0fad85d37ca3e1cc5b Mon Sep 17 00:00:00 2001 |
2 | From: Ezequiel Garcia <ezequiel@collabora.com> | |
3 | Date: Fri, 8 Feb 2019 11:17:47 -0500 | |
4 | Subject: media: rockchip/vpu: Correct return type for mem2mem buffer helpers | |
5 | ||
6 | [ Upstream commit 29701c3612fa025d5e8dc64c7a4ae8dc4763912e ] | |
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/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 6 +++--- | |
33 | drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 6 +++--- | |
34 | 2 files changed, 6 insertions(+), 6 deletions(-) | |
35 | ||
36 | diff --git a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | |
37 | index 5282236d1bb1..06daea66fb49 100644 | |
38 | --- a/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | |
39 | +++ b/drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | |
40 | @@ -80,7 +80,7 @@ rk3288_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu, | |
41 | void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
42 | { | |
43 | struct rockchip_vpu_dev *vpu = ctx->dev; | |
44 | - struct vb2_buffer *src_buf, *dst_buf; | |
45 | + struct vb2_v4l2_buffer *src_buf, *dst_buf; | |
46 | struct rockchip_vpu_jpeg_ctx jpeg_ctx; | |
47 | u32 reg; | |
48 | ||
49 | @@ -88,7 +88,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
50 | dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); | |
51 | ||
52 | memset(&jpeg_ctx, 0, sizeof(jpeg_ctx)); | |
53 | - jpeg_ctx.buffer = vb2_plane_vaddr(dst_buf, 0); | |
54 | + jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0); | |
55 | jpeg_ctx.width = ctx->dst_fmt.width; | |
56 | jpeg_ctx.height = ctx->dst_fmt.height; | |
57 | jpeg_ctx.quality = ctx->jpeg_quality; | |
58 | @@ -99,7 +99,7 @@ void rk3288_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
59 | VEPU_REG_ENC_CTRL); | |
60 | ||
61 | rk3288_vpu_set_src_img_ctrl(vpu, ctx); | |
62 | - rk3288_vpu_jpeg_enc_set_buffers(vpu, ctx, src_buf); | |
63 | + rk3288_vpu_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf); | |
64 | rk3288_vpu_jpeg_enc_set_qtable(vpu, | |
65 | rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 0), | |
66 | rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 1)); | |
67 | diff --git a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | |
68 | index dbc86d95fe3b..3d438797692e 100644 | |
69 | --- a/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | |
70 | +++ b/drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | |
71 | @@ -111,7 +111,7 @@ rk3399_vpu_jpeg_enc_set_qtable(struct rockchip_vpu_dev *vpu, | |
72 | void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
73 | { | |
74 | struct rockchip_vpu_dev *vpu = ctx->dev; | |
75 | - struct vb2_buffer *src_buf, *dst_buf; | |
76 | + struct vb2_v4l2_buffer *src_buf, *dst_buf; | |
77 | struct rockchip_vpu_jpeg_ctx jpeg_ctx; | |
78 | u32 reg; | |
79 | ||
80 | @@ -119,7 +119,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
81 | dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); | |
82 | ||
83 | memset(&jpeg_ctx, 0, sizeof(jpeg_ctx)); | |
84 | - jpeg_ctx.buffer = vb2_plane_vaddr(dst_buf, 0); | |
85 | + jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0); | |
86 | jpeg_ctx.width = ctx->dst_fmt.width; | |
87 | jpeg_ctx.height = ctx->dst_fmt.height; | |
88 | jpeg_ctx.quality = ctx->jpeg_quality; | |
89 | @@ -130,7 +130,7 @@ void rk3399_vpu_jpeg_enc_run(struct rockchip_vpu_ctx *ctx) | |
90 | VEPU_REG_ENCODE_START); | |
91 | ||
92 | rk3399_vpu_set_src_img_ctrl(vpu, ctx); | |
93 | - rk3399_vpu_jpeg_enc_set_buffers(vpu, ctx, src_buf); | |
94 | + rk3399_vpu_jpeg_enc_set_buffers(vpu, ctx, &src_buf->vb2_buf); | |
95 | rk3399_vpu_jpeg_enc_set_qtable(vpu, | |
96 | rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 0), | |
97 | rockchip_vpu_jpeg_get_qtable(&jpeg_ctx, 1)); | |
98 | -- | |
99 | 2.19.1 | |
100 |