aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 10:54:34 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2021-08-21 19:07:07 +0200
commit8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch)
tree1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
parent33b6885975ce376ff075362b7f0890326043111b (diff)
downloadupstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2
upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip
bcm27xx: add kernel 5.10 support
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch b/target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
new file mode 100644
index 0000000000..9c5a2a37b2
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0584-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
@@ -0,0 +1,42 @@
+From 4dfae141d031d0d85c5d338a09fa9253343861e3 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 9 Dec 2020 18:53:56 +0000
+Subject: [PATCH] staging/bcm2835-codec: Pass corrupt frame flag.
+
+MMAL has the flag MMAL_BUFFER_HEADER_FLAG_CORRUPTED but that
+wasn't being passed through, so add it.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -1019,6 +1019,7 @@ static void op_buffer_cb(struct vchiq_mm
+ struct mmal_buffer *mmal_buf)
+ {
+ struct bcm2835_codec_ctx *ctx = port->cb_ctx;
++ enum vb2_buffer_state buf_state = VB2_BUF_STATE_DONE;
+ struct m2m_mmal_buffer *buf;
+ struct vb2_v4l2_buffer *vb2;
+
+@@ -1075,6 +1076,9 @@ static void op_buffer_cb(struct vchiq_mm
+ vb2->flags |= V4L2_BUF_FLAG_LAST;
+ }
+
++ if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_CORRUPTED)
++ buf_state = VB2_BUF_STATE_ERROR;
++
+ /* vb2 timestamps in nsecs, mmal in usecs */
+ vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
+
+@@ -1082,7 +1086,7 @@ static void op_buffer_cb(struct vchiq_mm
+ if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
+ vb2->flags |= V4L2_BUF_FLAG_KEYFRAME;
+
+- vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_DONE);
++ vb2_buffer_done(&vb2->vb2_buf, buf_state);
+ ctx->num_op_buffers++;
+
+ v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d output buffers\n",