Merge pull request #5825 from HiassofT/le11-kernel-5.10.76

[le11] linux (RPi): update to 5.10.76-581049d, temp revert video callback limit commit
This commit is contained in:
CvH 2021-10-29 18:34:51 +02:00 committed by GitHub
commit 1cfd1233e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 11 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="8db7ef815b849a8a7cdd8e4cd14f41a07b0b0288" PKG_VERSION="d8754a956967a24ef5e57a1e25347babc3a02a58"
PKG_SHA256="dc5b420dba6bce5e56ccb2ef372a0d243e567629b5afa11e1c9be1ab3f764463" PKG_SHA256="72fb8524c019c1e5db2a873fbc0559f52530ca5ad090538be7944536a1241416"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

View File

@ -22,8 +22,8 @@ case "${LINUX}" in
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;; ;;
raspberrypi) raspberrypi)
PKG_VERSION="6cfe1a8b600aede17d8af723790eb58592d62f8a" # 5.10.75 PKG_VERSION="581049d718caf95f5feb00607ac748d5841cf27c" # 5.10.76
PKG_SHA256="3c6baa0ab5f6825dd7ef14d12f8d87c12e4e1b9be877c4fd8ff2a7272992a563" PKG_SHA256="62ba9db3d534d18ad118a980330376624231abd38a7fe4bbe718164fa6486259"
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;; ;;

View File

@ -0,0 +1,32 @@
From d93bee286143789995aa4ef2ffc195eaaff2d635 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
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

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="8db7ef815b849a8a7cdd8e4cd14f41a07b0b0288" PKG_VERSION="d8754a956967a24ef5e57a1e25347babc3a02a58"
PKG_SHA256="30f3f1d7ac042c58e8c7fb9c883969306869fc5afb96a64cb154bcf6c40b0bed" PKG_SHA256="ba9999efafb20e999ad95803f800d6d487c46dcd197ff37acd599a0a10a4b965"
PKG_ARCH="arm aarch64" PKG_ARCH="arm aarch64"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="rpi-eeprom" PKG_NAME="rpi-eeprom"
PKG_VERSION="194960a023af73d7a7ca3faf691cc78044c6e124" PKG_VERSION="47976e4409c6999a8e211976c75c60a97c90275c"
PKG_SHA256="bad956d05b21c52c1064aee51f667c6d321c079a7f8ee9b8f0bb2b94b93a763a" PKG_SHA256="fe67e174d897c6e29549129522c2fbce2404142e098c3c809c2a3b26b5708055"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="BSD-3/custom" PKG_LICENSE="BSD-3/custom"
PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -175,6 +175,7 @@ CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y CONFIG_FUTEX_PI=y
CONFIG_HAVE_FUTEX_CMPXCHG=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y CONFIG_TIMERFD=y

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -188,6 +188,7 @@ CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y CONFIG_BASE_FULL=y
CONFIG_FUTEX=y CONFIG_FUTEX=y
CONFIG_FUTEX_PI=y CONFIG_FUTEX_PI=y
CONFIG_HAVE_FUTEX_CMPXCHG=y
CONFIG_EPOLL=y CONFIG_EPOLL=y
CONFIG_SIGNALFD=y CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y CONFIG_TIMERFD=y

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # 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_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y