aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.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-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.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-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch b/target/linux/bcm27xx/patches-5.10/950-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
new file mode 100644
index 0000000000..7b05309e9a
--- /dev/null
+++ b/target/linux/bcm27xx/patches-5.10/950-0425-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
@@ -0,0 +1,43 @@
+From fec4f38da35da73f0ee3b28ad7daaf4a97855ea7 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 7 Jan 2021 11:41:26 +0000
+Subject: [PATCH] staging/bcm2835-codec: Log the number of excess
+ supported formats
+
+When logging that the firmware has provided more supported formats
+than we had allocated storage for, log the number allocated and
+returned.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -2836,8 +2836,10 @@ static int bcm2835_codec_get_supported_f
+
+ if (ret) {
+ if (ret == MMAL_MSG_STATUS_ENOSPC) {
+- v4l2_err(&dev->v4l2_dev, "%s: port has more encoding than we provided space for. Some are dropped.\n",
+- __func__);
++ v4l2_err(&dev->v4l2_dev,
++ "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
++ __func__, param_size / sizeof(u32),
++ MAX_SUPPORTED_ENCODINGS);
+ num_encodings = MAX_SUPPORTED_ENCODINGS;
+ } else {
+ v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
+@@ -2880,8 +2882,10 @@ static int bcm2835_codec_get_supported_f
+
+ if (ret) {
+ if (ret == MMAL_MSG_STATUS_ENOSPC) {
+- v4l2_err(&dev->v4l2_dev, "%s: port has more encoding than we provided space for. Some are dropped.\n",
+- __func__);
++ v4l2_err(&dev->v4l2_dev,
++ "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
++ __func__, param_size / sizeof(u32),
++ MAX_SUPPORTED_ENCODINGS);
+ num_encodings = MAX_SUPPORTED_ENCODINGS;
+ } else {
+ ret = -EINVAL;