From ac9298d79503e12aafcd78fb3cedf68d7c72b8d5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 12 Mar 2021 22:19:29 +0100 Subject: [PATCH] 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 --- packages/linux/package.mk | 4 +-- ...c4-Avoid-full-hdmi-audio-fifo-writes.patch | 30 ------------------- ...x-012-increase-hdmi-dma-axi-priority.patch | 21 ------------- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch delete mode 100644 packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index fa590b34d8..bc6c2ff14e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -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" ;; diff --git a/packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch b/packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch deleted file mode 100644 index c407892597..0000000000 --- a/packages/linux/patches/raspberrypi/linux-011-vc4-Avoid-full-hdmi-audio-fifo-writes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6ddb85813f7a61637a54f76a76ccb95ade8a50de Mon Sep 17 00:00:00 2001 -From: Dom Cobley -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 | diff --git a/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch b/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch deleted file mode 100644 index 197673b1c5..0000000000 --- a/packages/linux/patches/raspberrypi/linux-012-increase-hdmi-dma-axi-priority.patch +++ /dev/null @@ -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"; - };