From 41421d90560f40fcd2446eb1375f61f77eaced17 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 28 Oct 2021 11:01:19 +0200 Subject: [PATCH 1/5] rpi-eeprom: update to 47976e4 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index d7972ae099..a2643a7322 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="194960a023af73d7a7ca3faf691cc78044c6e124" -PKG_SHA256="bad956d05b21c52c1064aee51f667c6d321c079a7f8ee9b8f0bb2b94b93a763a" +PKG_VERSION="47976e4409c6999a8e211976c75c60a97c90275c" +PKG_SHA256="fe67e174d897c6e29549129522c2fbce2404142e098c3c809c2a3b26b5708055" PKG_ARCH="arm" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" From ada40e796681d116686e61ecbc027c48ee81e054 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 28 Oct 2021 16:43:23 +0200 Subject: [PATCH 2/5] RPi: update to firmware d8754a9 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 6bf3dc8377..aa0d3fec7b 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="8db7ef815b849a8a7cdd8e4cd14f41a07b0b0288" -PKG_SHA256="dc5b420dba6bce5e56ccb2ef372a0d243e567629b5afa11e1c9be1ab3f764463" +PKG_VERSION="d8754a956967a24ef5e57a1e25347babc3a02a58" +PKG_SHA256="72fb8524c019c1e5db2a873fbc0559f52530ca5ad090538be7944536a1241416" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 7904a38c40..515f2a8ec3 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="8db7ef815b849a8a7cdd8e4cd14f41a07b0b0288" -PKG_SHA256="30f3f1d7ac042c58e8c7fb9c883969306869fc5afb96a64cb154bcf6c40b0bed" +PKG_VERSION="d8754a956967a24ef5e57a1e25347babc3a02a58" +PKG_SHA256="ba9999efafb20e999ad95803f800d6d487c46dcd197ff37acd599a0a10a4b965" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 60973cf0b908b0eb4983b41ffc4a564dea4cc53a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 28 Oct 2021 16:44:18 +0200 Subject: [PATCH 3/5] linux (RPi): update to 5.10.76-581049d Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index f4b1ec12f5..e73a2a13e5 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="6cfe1a8b600aede17d8af723790eb58592d62f8a" # 5.10.75 - PKG_SHA256="3c6baa0ab5f6825dd7ef14d12f8d87c12e4e1b9be877c4fd8ff2a7272992a563" + PKG_VERSION="581049d718caf95f5feb00607ac748d5841cf27c" # 5.10.76 + PKG_SHA256="62ba9db3d534d18ad118a980330376624231abd38a7fe4bbe718164fa6486259" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From be6ed1bc3cfb9035e7b6f4ad76a0b44176ed0a0a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 28 Oct 2021 16:46:03 +0200 Subject: [PATCH 4/5] linux (RPi): config options for 5.10.76-581049d Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 6307543d5e..1a03d3ab1d 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.73 Kernel Configuration +# Linux/arm 5.10.76 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -175,6 +175,7 @@ CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y +CONFIG_HAVE_FUTEX_CMPXCHG=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index a166b3aa8f..612292dd5d 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.73 Kernel Configuration +# Linux/arm 5.10.76 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y @@ -188,6 +188,7 @@ CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y +CONFIG_HAVE_FUTEX_CMPXCHG=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 56774126cb..a8e5c56ad5 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.73 Kernel Configuration +# Linux/arm64 5.10.76 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110" CONFIG_CC_IS_GCC=y From d0a33bc1c895166c75eaac17edb2203de9c301f8 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 29 Oct 2021 12:50:11 +0200 Subject: [PATCH 5/5] linux (RPi): temporarily revert video codec callback limit The callback limit can cause stalls in kodi and ffmpeg, revert the commit until a proper solution has been found. Signed-off-by: Matthias Reichl --- ...mp-revert-video-codec-callback-limit.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/linux/patches/raspberrypi/linux-001-temp-revert-video-codec-callback-limit.patch diff --git a/packages/linux/patches/raspberrypi/linux-001-temp-revert-video-codec-callback-limit.patch b/packages/linux/patches/raspberrypi/linux-001-temp-revert-video-codec-callback-limit.patch new file mode 100644 index 0000000000..1d03d4a2f6 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-001-temp-revert-video-codec-callback-limit.patch @@ -0,0 +1,32 @@ +From d93bee286143789995aa4ef2ffc195eaaff2d635 Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Fri, 29 Oct 2021 12:48:42 +0200 +Subject: [PATCH] Revert "media: bcm2835-codec: Limit video callbacks" + +This reverts commit f814bfc5f4d3005eb266a1556be8b7b8770629bd. +--- + .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +index e8452c82d088..6078d6e2ace0 100644 +--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c ++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c +@@ -2510,14 +2510,6 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx) + MMAL_PARAMETER_VIDEO_STOP_ON_PAR_COLOUR_CHANGE, + &enable, + sizeof(enable)); +- +- enable = (unsigned int)-5; +- vchiq_mmal_port_parameter_set(dev->instance, +- &ctx->component->control, +- MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS, +- &enable, +- sizeof(enable)); +- + } else if (dev->role == DEINTERLACE) { + /* Select the default deinterlace algorithm. */ + int half_framerate = 0; +-- +2.30.2 +