linux (RPi): update to 5.10.22-b2625fe

Dropped local HDMI audio FIFO patches, new version is now in RPi kernel.
The update also resolves the long standing flip_done timeout issues on
RPi3 and adds VC1 decoding via V4L2 on RPi0-3 (the latter needs a firmware
update which isn't released yet).

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2021-03-12 22:19:29 +01:00
parent 31d14d98ff
commit ac9298d795
3 changed files with 2 additions and 53 deletions

View File

@ -22,8 +22,8 @@ case "${LINUX}" in
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;;
raspberrypi)
PKG_VERSION="4413b6e0a939a0713bb647571d1e537bd12294a2" # 5.10.22
PKG_SHA256="82826eb57cce4623f8e07d4fc7d66d63dfbc002b0b09d79a41cc7a6b7bf73de4"
PKG_VERSION="b2625fe6a563619b3d8a5db79fb20bf23df0fdc6" # 5.10.22
PKG_SHA256="98b4aeeba5ecff2607cbba807b09d726e46aa430cadd4b0f55a39ee75f8d59ee"
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;;

View File

@ -1,30 +0,0 @@
From 6ddb85813f7a61637a54f76a76ccb95ade8a50de Mon Sep 17 00:00:00 2001
From: Dom Cobley <popcornmix@gmail.com>
Date: Sun, 24 Jan 2021 15:44:10 +0000
Subject: [PATCH] vc4: Avoid full hdmi audio fifo writes
We are getting occasional VC4_HD_MAI_CTL_ERRORF in HDMI_MAI_CTL which seem to correspond with
audio dropouts. Reduce the threshold where we deassert DREQ to avoid the fifo overfilling
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 64b1567998861..3b85158fbbaa8 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1562,10 +1562,10 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,
/* Set the MAI threshold */
HDMI_WRITE(HDMI_MAI_THR,
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
+ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) |
+ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) |
+ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQHIGH) |
+ VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW));
HDMI_WRITE(HDMI_MAI_CONFIG,
VC4_HDMI_MAI_CONFIG_BIT_REVERSE |

View File

@ -1,21 +0,0 @@
diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
index 8053ef54acc8..6bcfcc5b1ac5 100644
--- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
@@ -179,7 +179,7 @@ &pixelvalve4 {
};
&hdmi0 {
- dmas = <&dma (10|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
+ dmas = <&dma (10|(1<<27)|(1<<24)|(15<<16)|(15<<20))>;
status = "disabled";
};
@@ -188,7 +188,7 @@ &ddc0 {
};
&hdmi1 {
- dmas = <&dma (17|(1<<27)|(1<<24)|(0<<16)|(15<<20))>;
+ dmas = <&dma (17|(1<<27)|(1<<24)|(15<<16)|(15<<20))>;
status = "disabled";
};