From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Sasha Levin <sashal@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 32/63] media: s5p-jpeg: Correct return type for mem2mem buffer helpers
Date: Wed, 27 Mar 2019 14:22:52 -0400 [thread overview]
Message-ID: <20190327182323.18577-32-sashal@kernel.org> (raw)
In-Reply-To: <20190327182323.18577-1-sashal@kernel.org>
From: Ezequiel Garcia <ezequiel@collabora.com>
[ Upstream commit 4a88f89885c7cf65c62793f385261a6e3315178a ]
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/s5p-jpeg/jpeg-core.c | 38 ++++++++++-----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 9c6fc09b88e0..80c83bba7af3 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -788,14 +788,14 @@ static void skip(struct s5p_jpeg_buffer *buf, long len);
static void exynos4_jpeg_parse_decode_h_tbl(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ struct vb2_v4l2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
struct s5p_jpeg_buffer jpeg_buffer;
unsigned int word;
int c, x, components;
jpeg_buffer.size = 2; /* Ls */
jpeg_buffer.data =
- (unsigned long)vb2_plane_vaddr(vb, 0) + ctx->out_q.sos + 2;
+ (unsigned long)vb2_plane_vaddr(&vb->vb2_buf, 0) + ctx->out_q.sos + 2;
jpeg_buffer.curr = 0;
word = 0;
@@ -825,14 +825,14 @@ static void exynos4_jpeg_parse_decode_h_tbl(struct s5p_jpeg_ctx *ctx)
static void exynos4_jpeg_parse_huff_tbl(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ struct vb2_v4l2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
struct s5p_jpeg_buffer jpeg_buffer;
unsigned int word;
int c, i, n, j;
for (j = 0; j < ctx->out_q.dht.n; ++j) {
jpeg_buffer.size = ctx->out_q.dht.len[j];
- jpeg_buffer.data = (unsigned long)vb2_plane_vaddr(vb, 0) +
+ jpeg_buffer.data = (unsigned long)vb2_plane_vaddr(&vb->vb2_buf, 0) +
ctx->out_q.dht.marker[j];
jpeg_buffer.curr = 0;
@@ -884,13 +884,13 @@ static void exynos4_jpeg_parse_huff_tbl(struct s5p_jpeg_ctx *ctx)
static void exynos4_jpeg_parse_decode_q_tbl(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ struct vb2_v4l2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
struct s5p_jpeg_buffer jpeg_buffer;
int c, x, components;
jpeg_buffer.size = ctx->out_q.sof_len;
jpeg_buffer.data =
- (unsigned long)vb2_plane_vaddr(vb, 0) + ctx->out_q.sof;
+ (unsigned long)vb2_plane_vaddr(&vb->vb2_buf, 0) + ctx->out_q.sof;
jpeg_buffer.curr = 0;
skip(&jpeg_buffer, 5); /* P, Y, X */
@@ -915,14 +915,14 @@ static void exynos4_jpeg_parse_decode_q_tbl(struct s5p_jpeg_ctx *ctx)
static void exynos4_jpeg_parse_q_tbl(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ struct vb2_v4l2_buffer *vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
struct s5p_jpeg_buffer jpeg_buffer;
unsigned int word;
int c, i, j;
for (j = 0; j < ctx->out_q.dqt.n; ++j) {
jpeg_buffer.size = ctx->out_q.dqt.len[j];
- jpeg_buffer.data = (unsigned long)vb2_plane_vaddr(vb, 0) +
+ jpeg_buffer.data = (unsigned long)vb2_plane_vaddr(&vb->vb2_buf, 0) +
ctx->out_q.dqt.marker[j];
jpeg_buffer.curr = 0;
@@ -2016,15 +2016,15 @@ static void s5p_jpeg_device_run(void *priv)
{
struct s5p_jpeg_ctx *ctx = priv;
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *src_buf, *dst_buf;
+ struct vb2_v4l2_buffer *src_buf, *dst_buf;
unsigned long src_addr, dst_addr, flags;
spin_lock_irqsave(&ctx->jpeg->slock, flags);
src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
- src_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
- dst_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+ src_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
+ dst_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
s5p_jpeg_reset(jpeg->regs);
s5p_jpeg_poweron(jpeg->regs);
@@ -2097,7 +2097,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
struct s5p_jpeg_fmt *fmt;
- struct vb2_buffer *vb;
+ struct vb2_v4l2_buffer *vb;
struct s5p_jpeg_addr jpeg_addr = {};
u32 pix_size, padding_bytes = 0;
@@ -2116,7 +2116,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
}
- jpeg_addr.y = vb2_dma_contig_plane_dma_addr(vb, 0);
+ jpeg_addr.y = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
if (fmt->colplanes == 2) {
jpeg_addr.cb = jpeg_addr.y + pix_size - padding_bytes;
@@ -2134,7 +2134,7 @@ static void exynos4_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
static void exynos4_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb;
+ struct vb2_v4l2_buffer *vb;
unsigned int jpeg_addr = 0;
if (ctx->mode == S5P_JPEG_ENCODE)
@@ -2142,7 +2142,7 @@ static void exynos4_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)
else
vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
- jpeg_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+ jpeg_addr = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
if (jpeg->variant->version == SJPEG_EXYNOS5433 &&
ctx->mode == S5P_JPEG_DECODE)
jpeg_addr += ctx->out_q.sos;
@@ -2257,7 +2257,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
struct s5p_jpeg_fmt *fmt;
- struct vb2_buffer *vb;
+ struct vb2_v4l2_buffer *vb;
struct s5p_jpeg_addr jpeg_addr = {};
u32 pix_size;
@@ -2271,7 +2271,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
fmt = ctx->cap_q.fmt;
}
- jpeg_addr.y = vb2_dma_contig_plane_dma_addr(vb, 0);
+ jpeg_addr.y = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
if (fmt->colplanes == 2) {
jpeg_addr.cb = jpeg_addr.y + pix_size;
@@ -2289,7 +2289,7 @@ static void exynos3250_jpeg_set_img_addr(struct s5p_jpeg_ctx *ctx)
static void exynos3250_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)
{
struct s5p_jpeg *jpeg = ctx->jpeg;
- struct vb2_buffer *vb;
+ struct vb2_v4l2_buffer *vb;
unsigned int jpeg_addr = 0;
if (ctx->mode == S5P_JPEG_ENCODE)
@@ -2297,7 +2297,7 @@ static void exynos3250_jpeg_set_jpeg_addr(struct s5p_jpeg_ctx *ctx)
else
vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
- jpeg_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+ jpeg_addr = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
exynos3250_jpeg_jpgadr(jpeg->regs, jpeg_addr);
}
--
2.19.1
next prev parent reply other threads:[~2019-03-27 18:24 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 18:22 [PATCH AUTOSEL 4.4 01/63] CIFS: fix POSIX lock leak and invalid ptr deref Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 02/63] h8300: use cc-cross-prefix instead of hardcoding h8300-unknown-linux- Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 03/63] i2c: sis630: correct format strings Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 04/63] tracing: kdb: Fix ftdump to not sleep Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 05/63] gpio: gpio-omap: fix level interrupt idling Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 06/63] sysctl: handle overflow for file-max Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 07/63] enic: fix build warning without CONFIG_CPUMASK_OFFSTACK Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 08/63] mm/cma.c: cma_declare_contiguous: correct err handling Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 09/63] mm/page_ext.c: fix an imbalance with kmemleak Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 10/63] mm/vmalloc.c: fix kernel BUG at mm/vmalloc.c:512! Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 11/63] mm/slab.c: kmemleak no scan alien caches Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 12/63] ocfs2: fix a panic problem caused by o2cb_ctl Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 13/63] f2fs: do not use mutex lock in atomic context Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 14/63] fs/file.c: initialize init_files.resize_wait Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 15/63] cifs: use correct format characters Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 16/63] dm thin: add sanity checks to thin-pool and external snapshot creation Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 17/63] cifs: Fix NULL pointer dereference of devname Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 18/63] fs: fix guard_bio_eod to check for real EOD errors Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 19/63] tools lib traceevent: Fix buffer overflow in arg_eval Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 20/63] usb: chipidea: Grab the (legacy) USB PHY by phandle first Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 21/63] scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 22/63] coresight: etm4x: Add support to enable ETMv4.2 Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 23/63] ARM: 8840/1: use a raw_spinlock_t in unwind Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 24/63] mmc: omap: fix the maximum timeout setting Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 25/63] e1000e: Fix -Wformat-truncation warnings Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 26/63] IB/mlx4: Increase the timeout for CM cache Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 27/63] ASoC: qcom: Fix of-node refcount unbalance in apq8016_sbc_parse_of() Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 28/63] scsi: megaraid_sas: return error when create DMA pool failed Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 29/63] perf test: Fix failure of 'evsel-tp-sched' test on s390 Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 30/63] SoC: imx-sgtl5000: add missing put_device() Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 31/63] media: sh_veu: Correct return type for mem2mem buffer helpers Sasha Levin
2019-03-27 18:22 ` Sasha Levin [this message]
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 33/63] media: s5p-g2d: " Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 34/63] media: mx2_emmaprp: " Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 35/63] leds: lp55xx: fix null deref on firmware load failure Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 36/63] kprobes: Prohibit probing on bsearch() Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 37/63] ARM: 8833/1: Ensure that NEON code always compiles with Clang Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 38/63] ALSA: PCM: check if ops are defined before suspending PCM Sasha Levin
2019-03-27 18:22 ` [PATCH AUTOSEL 4.4 39/63] bcache: fix input overflow to cache set sysfs file io_error_halflife Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 40/63] bcache: fix input overflow to sequential_cutoff Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 41/63] bcache: improve sysfs_strtoul_clamp() Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 42/63] fbdev: fbmem: fix memory access if logo is bigger than the screen Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 43/63] cdrom: Fix race condition in cdrom_sysctl_register Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 44/63] e1000e: fix cyclic resets at link up with active tx Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 45/63] ASoC: fsl-asoc-card: fix object reference leaks in fsl_asoc_card_probe Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 46/63] locking/lockdep: Add debug_locks check in __lock_downgrade() Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 47/63] soc: qcom: gsbi: Fix error handling in gsbi_probe() Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 48/63] mt7601u: bump supported EEPROM version Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 49/63] ARM: avoid Cortex-A9 livelock on tight dmb loops Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 50/63] tty: increase the default flip buffer limit to 2*640K Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 51/63] media: mt9m111: set initial frame size other than 0x0 Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 52/63] hwrng: virtio - Avoid repeated init of completion Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 53/63] soc/tegra: fuse: Fix illegal free of IO base address Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 54/63] Bluetooth: Verify that l2cap_get_conf_opt provides large enough buffer Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 55/63] hpet: Fix missing '=' character in the __setup() code of hpet_mmap_enable Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 56/63] dmaengine: imx-dma: fix warning comparison of distinct pointer types Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 57/63] netfilter: physdev: relax br_netfilter dependency Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 58/63] media: s5p-jpeg: Check for fmt_ver_flag when doing fmt enumeration Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 59/63] regulator: act8865: Fix act8600_sudcdc_voltage_ranges setting Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 60/63] wlcore: Fix memory leak in case wl12xx_fetch_firmware failure Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 61/63] x86/build: Mark per-CPU symbols as absolute explicitly for LLD Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 62/63] dmaengine: tegra: avoid overflow of byte tracking Sasha Levin
2019-03-27 18:23 ` [PATCH AUTOSEL 4.4 63/63] drm/dp/mst: Configure no_stop_bit correctly for remote i2c xfers Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327182323.18577-32-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=ezequiel@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox