diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-18 18:04:33 +0100 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-19 07:17:21 +0100 |
| commit | 62b7f5931c54e96fca56dd8761b0e466d355c881 (patch) | |
| tree | 1258b392752379833a075df006c2f6d7ac4be51d /target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch | |
| parent | 76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (diff) | |
| download | upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.gz upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.tar.bz2 upstream-62b7f5931c54e96fca56dd8761b0e466d355c881.zip | |
bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch b/target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch deleted file mode 100644 index 18073a8f9d..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0499-media-v4l2-mem2mem-Fix-hold-buf-flag-checks.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 73d8a76ec5b5e1240af4142a9ccbd39179d779af Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec <jernej.skrabec@siol.net> -Date: Wed, 6 Nov 2019 08:02:53 +0100 -Subject: [PATCH] media: v4l2-mem2mem: Fix hold buf flag checks - -Commit 1076df3a77b490d33429560a9e0603b3673223e2 upstream. - -Hold buf flag is set on output queue, not capture. Fix that. - -Fixes: f07602ac3887 ("media: v4l2-mem2mem: add new_frame detection") -Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> -Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> -Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> ---- - drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/media/v4l2-core/v4l2-mem2mem.c -+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c -@@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct - } - } - -- if (src && dst && (m2m_ctx->cap_q_ctx.q.subsystem_flags & -+ if (src && dst && (m2m_ctx->out_q_ctx.q.subsystem_flags & - VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)) - m2m_ctx->new_frame = !dst->vb2_buf.copied_timestamp || - dst->vb2_buf.timestamp != src->vb2_buf.timestamp; -@@ -474,7 +474,7 @@ void v4l2_m2m_job_finish(struct v4l2_m2m - * holding capture buffers. Those should use - * v4l2_m2m_buf_done_and_job_finish() instead. - */ -- WARN_ON(m2m_ctx->cap_q_ctx.q.subsystem_flags & -+ WARN_ON(m2m_ctx->out_q_ctx.q.subsystem_flags & - VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF); - spin_lock_irqsave(&m2m_dev->job_spinlock, flags); - schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx); |