From 0a31b3eb4e61ce6fd1dee215e238416f8bdd5ba5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 9 Mar 2023 10:44:14 +0100 Subject: [PATCH 1/8] linux (RPi): update to 6.1.15-78eb7ea 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 5b6728b543..d9b7527dab 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="0c9bfdb7d67b1b81079d14f17a50fc1a35242c85" # 6.1.14 - PKG_SHA256="f85e20a4b4c9f5a67101264b5f7af7a2d14ee4bcfb3f1ec07c73f518b9daadbb" + PKG_VERSION="78eb7eaf61cc71dc4bd06c6d9f773c3fc2620e41" # 6.1.15 + PKG_SHA256="5dd3e8b7605338de397c4284407759d470d45c5244ff28e46481f0977d410245" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From d6a255cd1ba98ede87f21d7cf80e01bde6f05415 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:01:07 +0100 Subject: [PATCH 2/8] RPi: update to firmware 379d5bf 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 129779c25a..08c3464504 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="489d3e2d025f5035491004f50d58cfe9690e3976" -PKG_SHA256="bb6f06f0cfd0d6d810a0cb07225daddea3c0490a2e9bd69c4095341dc45dfc55" +PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" +PKG_SHA256="1147fffb0e9de3990c118c164c1032e5f0965d6b6e12e727aa2c353d8b795f57" 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 3f9c5cb5e7..53770cc6fe 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="489d3e2d025f5035491004f50d58cfe9690e3976" -PKG_SHA256="ac2f526fd17c6b15dd6e67aceffb93c5ca7afa7cc1e757fdd06123d318126b99" +PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" +PKG_SHA256="a3224060294e02acf7440446d37764e1dda65bdeb395c817e6d9df9c07de2bcf" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 184cf5295c6d8e0e7910af400a12638ec25b7a17 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:03:58 +0100 Subject: [PATCH 3/8] linux (RPi): update to 6.1.16-02928eb 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 d9b7527dab..251fa4b727 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="78eb7eaf61cc71dc4bd06c6d9f773c3fc2620e41" # 6.1.15 - PKG_SHA256="5dd3e8b7605338de397c4284407759d470d45c5244ff28e46481f0977d410245" + PKG_VERSION="02928eb7eb435c6ec86745dcbb6ff99992128149" # 6.1.16 + PKG_SHA256="52420a584d66279c61467c13619eceb305afd9f32a854ab1cb9134289f9d54d0" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From dfc23bf03ef0ae1961d454cda1147e5dbd2b92cd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:03:58 +0100 Subject: [PATCH 4/8] linux (RPi): config options for 6.1.16-02928eb Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 5 +---- projects/RPi/devices/RPi2/linux/linux.arm.conf | 5 +---- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 6 +----- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 06ae1188d9..f54fb6657c 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 6.1.13 Kernel Configuration +# Linux/arm 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -2486,7 +2486,6 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -3751,8 +3750,6 @@ CONFIG_DRM_VC4=y CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 252d771412..e46f3d168e 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 6.1.13 Kernel Configuration +# Linux/arm 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -2716,7 +2716,6 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -3984,8 +3983,6 @@ CONFIG_DRM_VC4=y CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 3951b3b883..e6ef07c4c9 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 6.1.13 Kernel Configuration +# Linux/arm64 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -4580,8 +4580,6 @@ CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set @@ -5734,7 +5732,6 @@ CONFIG_DMA_BCM2835=y # CONFIG_DW_AXI_DMAC is not set # CONFIG_FSL_EDMA is not set # CONFIG_FSL_QDMA is not set -# CONFIG_HISI_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_MV_XOR_V2 is not set # CONFIG_PL330_DMA is not set @@ -6213,7 +6210,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From cbc7d3e75c12412677590d330c6abb55ccf0cebd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 22:53:29 +0100 Subject: [PATCH 5/8] linux (RPi): add patch to fix color format check in vc4_hdmi This fixes "no video" issue when working around EDID problems with eg video=... kernel command line parameter. Signed-off-by: Matthias Reichl --- .../linux-010-fix-vc4-rgb-check.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch diff --git a/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch b/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch new file mode 100644 index 0000000000..b610cb8b02 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch @@ -0,0 +1,41 @@ +From affc6fdac5376701ea468270af1b6fd9ca7616be Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 11 Mar 2023 22:41:17 +0100 +Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format check + +RGB is a mandatory format for all DVI and HDMI monitors so there's +no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in +color_formats. + +More importantly this checks breaks working around EDID issues with +eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin +as the RGB444 bit is only set when a valid EDID with digital bit set in +the input byte is present - which isn't the case when no EDID can be +read from the display device at all or with the in-built kernel EDIDs, +which mimic analog (VGA) displays without the digital bit set. + +So drop the check, if we output video on the HDMI connector we can +assume that the display can accept 8bit RGB. + +Signed-off-by: Matthias Reichl +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index bd762b4e3e8f2..3c60c93c0f888 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi, + case VC4_HDMI_OUTPUT_RGB: + drm_dbg(dev, "RGB Format, checking the constraints.\n"); + +- if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444)) +- return false; +- + if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) { + drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n"); + return false; +-- +2.39.2 + From 37ef5910933e68a243f9863c500192d82ae56352 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 12:23:42 +0100 Subject: [PATCH 6/8] linux (RPi): update to 6.1.19-e3376fb 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 251fa4b727..52be6dfca7 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="02928eb7eb435c6ec86745dcbb6ff99992128149" # 6.1.16 - PKG_SHA256="52420a584d66279c61467c13619eceb305afd9f32a854ab1cb9134289f9d54d0" + PKG_VERSION="e3376fb94fda798d2a322e9c70789286132a1a9f" # 6.1.19 + PKG_SHA256="f1b518ea84ad269ec0a926623aaba43ea0c176e8254438bb4e8c87f267e87e1e" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From df7391bef629471a0337abc63ca84d1752462e58 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 12:23:42 +0100 Subject: [PATCH 7/8] linux (RPi): config options for 6.1.19-e3376fb 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 | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index f54fb6657c..510f3aa77f 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 6.1.16 Kernel Configuration +# Linux/arm 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1061,7 +1061,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # Classification # # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index e46f3d168e..9f83e2c9b4 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 6.1.16 Kernel Configuration +# Linux/arm 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1243,7 +1243,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_CLS=y # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index e6ef07c4c9..7ac7dc8283 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 6.1.16 Kernel Configuration +# Linux/arm64 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1325,7 +1325,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_CLS=y # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set From aadbd4cace86d402c1e0a33477ea94e192b572f8 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 16:16:27 +0100 Subject: [PATCH 8/8] RPi: update to firmware 2c9ca22 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 08c3464504..811defdee9 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="379d5bfa60bf3b0afff413a18344aaaf3bde0083" -PKG_SHA256="1147fffb0e9de3990c118c164c1032e5f0965d6b6e12e727aa2c353d8b795f57" +PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" +PKG_SHA256="92d8e4b6afe864c82cb19db387ab3b089d9148a1eadbc467c441fda4450bc5c3" 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 53770cc6fe..404452751e 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="379d5bfa60bf3b0afff413a18344aaaf3bde0083" -PKG_SHA256="a3224060294e02acf7440446d37764e1dda65bdeb395c817e6d9df9c07de2bcf" +PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" +PKG_SHA256="575d16dfd8e481abbe7410e284b30706e82bd69f1f56528520bcb7dea72766f1" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com"