Merge pull request #5451 from HiassofT/le10-kernel-5.10.35+

linux (RPi): update to 5.10.46

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="1df55790fb191704c0ce630d4d0713a8beb43a7d"
+PKG_VERSION="5ceac9414fd634dbc0762d80677744465634af2f"
-PKG_SHA256="9be26aae349616aa2cfa82c11f3188efb848e36d6ebe401f5d8682e376483d56"
+PKG_SHA256="5e9f690ffb378748c8b4e9f3d8e8688701932b50db9202842cd8df2808993f70"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/graphics/bcm2835-driver/system.d/unbind-console.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=unbind Framebuffer console
-
-ConditionPathExists=/sys/class/vtconsole/vtcon1/bind
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh -c 'echo 0 > /sys/class/vtconsole/vtcon1/bind'
-
-[Install]
-WantedBy=graphical.target

packages/linux/package.mk

@@ -22,8 +22,8 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   raspberrypi)
-    PKG_VERSION="7fb9d006d3ff3baf2e205e0c85c4e4fd0a64fcd0" # 5.10.27
+    PKG_VERSION="9b672c5441497337f286686122a6f17fd7985cc2" # 5.10.46
-    PKG_SHA256="e70ecd479ea323d00ed441f1888256687dec96b0f4098585b1646f2d5d930eff"
+    PKG_SHA256="5f620ce59d6f27dd77f7675517c3f691b40c4b9cce6d608f3bbfd3e449f9125c"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

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="1df55790fb191704c0ce630d4d0713a8beb43a7d"
+PKG_VERSION="5ceac9414fd634dbc0762d80677744465634af2f"
-PKG_SHA256="b6163311508800ac82bae28260ea774ee35d92f86987a09cf0fc7880c61e9040"
+PKG_SHA256="6ae8d2ea912cf6cc52f4fc9bc01a823b00a9f8c2ecb61d261bb0d12bee379c9e"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

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="e6107348e051c868493523f57e0c8c08d20921a5"
+PKG_VERSION="5d70742580859c5f54eb4cb8bf9b730067ffc396"
-PKG_SHA256="022a209bf1f24da9873423e1ea52a4e0722c88aaa4969e1555fe3c40c8172f79"
+PKG_SHA256="38d0733257db508e3a539a726bee3b92d59acaeac57cf3103b102b6d23ed4760"
 PKG_ARCH="arm"
 PKG_LICENSE="BSD-3/custom"
 PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"

projects/RPi/devices/RPi/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.32 Kernel Configuration
+# Linux/arm 5.10.44 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1266,6 +1266,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # NVME Support
 #
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support
 
@@ -2249,6 +2250,7 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_RPI_POE_POWER=m
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
@@ -3570,6 +3572,7 @@ CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -3746,6 +3749,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set

projects/RPi/devices/RPi2/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.32 Kernel Configuration
+# Linux/arm 5.10.44 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1392,6 +1392,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # NVME Support
 #
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support
 
@@ -2383,6 +2384,7 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_RPI_POE_POWER=m
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
@@ -3707,6 +3709,7 @@ CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -3883,6 +3886,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set

projects/RPi/devices/RPi4/config/distroconfig.txt

@@ -6,3 +6,6 @@ dtoverlay=vc4-kms-v3d,cma-512
 dtoverlay=rpivid-v4l2
 disable_overscan=1
 disable_fw_kms_setup=1
+# temporarily limit framebuffer size to avoid gpu memory issues at 4kp60
+max_framebuffer_width=1920
+max_framebuffer_width=1080

projects/RPi/devices/RPi4/linux/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.32 Kernel Configuration
+# Linux/arm 5.10.44 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0"
 CONFIG_CC_IS_GCC=y
@@ -1479,6 +1479,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 #
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support
 
@@ -2812,6 +2813,7 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_RPI_POE_POWER=m
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
@@ -4211,6 +4213,7 @@ CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
@@ -4452,6 +4455,7 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CX2072X is not set
 CONFIG_SND_SOC_DA7213=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set

projects/RPi/devices/RPi4/patches/kodi/0001-hack-try-to-hide-pixel-wrap-issues.patch

@@ -1,90 +0,0 @@
-From 7220f2de9c3f29f4bd005ef442a656047a69561b Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 8 Apr 2020 11:19:22 +0100
-Subject: [PATCH] pi4: hack: Try to hide pixel wrap issue
-
----
- .../HwDecRender/VideoLayerBridgeDRMPRIME.cpp  | 22 ++++++++++++++-----
- xbmc/windowing/gbm/drm/DRMAtomic.cpp          | 10 +++++++--
- 2 files changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-index c78636b680..ed737820f1 100644
---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-@@ -11,6 +11,7 @@
- #include "cores/VideoPlayer/Buffers/VideoBufferDRMPRIME.h"
- #include "utils/log.h"
- #include "windowing/gbm/drm/DRMAtomic.h"
-+#include "settings/DisplaySettings.h"
- 
- #include <utility>
- 
-@@ -264,14 +265,25 @@ void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, cons
-   auto plane = m_DRM->GetVideoPlane();
-   m_DRM->AddProperty(plane, "FB_ID", buffer->m_fb_id);
-   m_DRM->AddProperty(plane, "CRTC_ID", m_DRM->GetCrtc()->GetCrtcId());
-+
-+  uint32_t srcw = buffer->GetWidth();
-+  uint32_t dstw = static_cast<uint32_t>(destRect.Width());
-+  int32_t dstx = static_cast<int32_t>(destRect.x1);
-+  double scalex = (double)srcw / (double)dstw;
-+  RESOLUTION_INFO &res = CDisplaySettings::GetInstance().GetCurrentResolutionInfo();
-+  if (dstw > 1 && dstx + dstw > (uint32_t)res.iScreenWidth - 1)
-+  {
-+    dstw -= 1;
-+    srcw = (uint32_t)(srcw - 1.0 * scalex + 0.5);
-+  }
-   m_DRM->AddProperty(plane, "SRC_X", 0);
-   m_DRM->AddProperty(plane, "SRC_Y", 0);
--  m_DRM->AddProperty(plane, "SRC_W", buffer->GetWidth() << 16);
-+  m_DRM->AddProperty(plane, "SRC_W", srcw << 16);
-   m_DRM->AddProperty(plane, "SRC_H", buffer->GetHeight() << 16);
--  m_DRM->AddProperty(plane, "CRTC_X", static_cast<int32_t>(destRect.x1) & ~1);
--  m_DRM->AddProperty(plane, "CRTC_Y", static_cast<int32_t>(destRect.y1) & ~1);
--  m_DRM->AddProperty(plane, "CRTC_W", (static_cast<uint32_t>(destRect.Width()) + 1) & ~1);
--  m_DRM->AddProperty(plane, "CRTC_H", (static_cast<uint32_t>(destRect.Height()) + 1) & ~1);
-+  m_DRM->AddProperty(plane, "CRTC_X", dstx);
-+  m_DRM->AddProperty(plane, "CRTC_Y", static_cast<int32_t>(destRect.y1));
-+  m_DRM->AddProperty(plane, "CRTC_W", dstw);
-+  m_DRM->AddProperty(plane, "CRTC_H", static_cast<uint32_t>(destRect.Height()));
- }
- 
- void CVideoLayerBridgeDRMPRIME::UpdateVideoPlane()
-diff --git a/xbmc/windowing/gbm/drm/DRMAtomic.cpp b/xbmc/windowing/gbm/drm/DRMAtomic.cpp
-index 5d61a699d4..de02d84758 100644
---- a/xbmc/windowing/gbm/drm/DRMAtomic.cpp
-+++ b/xbmc/windowing/gbm/drm/DRMAtomic.cpp
-@@ -92,13 +92,19 @@ void CDRMAtomic::DrmAtomicCommit(int fb_id, int flags, bool rendered, bool video
-       return;
-   }
- 
-+  uint32_t srcw = m_width;
-+  uint32_t dstw = m_mode->hdisplay;
-+  double scalex = (double)srcw / (double)dstw;
-+  dstw -= 1;
-+  srcw = (uint32_t)(srcw - 1.0 * scalex + 0.5);
-+
-   if (rendered)
-   {
-     AddProperty(m_gui_plane, "FB_ID", fb_id);
-     AddProperty(m_gui_plane, "CRTC_ID", m_crtc->GetCrtcId());
-     AddProperty(m_gui_plane, "SRC_X", 0);
-     AddProperty(m_gui_plane, "SRC_Y", 0);
--    AddProperty(m_gui_plane, "SRC_W", m_width << 16);
-+    AddProperty(m_gui_plane, "SRC_W", srcw << 16);
-     AddProperty(m_gui_plane, "SRC_H", m_height << 16);
-     AddProperty(m_gui_plane, "CRTC_X", 0);
-     AddProperty(m_gui_plane, "CRTC_Y", 0);
-@@ -109,7 +115,7 @@ void CDRMAtomic::DrmAtomicCommit(int fb_id, int flags, bool rendered, bool video
-     // }
-     // else
-     {
--      AddProperty(m_gui_plane, "CRTC_W", m_mode->hdisplay);
-+      AddProperty(m_gui_plane, "CRTC_W", dstw);
-       AddProperty(m_gui_plane, "CRTC_H", m_mode->vdisplay);
-     }
- 
--- 
-2.20.1
-

projects/RPi/filesystem/usr/share/alsa/cards/vc4-hdmi.conf

@@ -35,6 +35,7 @@ vc4-hdmi.pcm.hdmi.0 {
 				hook_args [
 				{
 					name "IEC958 Playback Default"
+					interface PCM
 					optional true
 					lock true
 					preserve true

tools/ffmpeg/gen-patches.sh

@@ -2,7 +2,7 @@
 
 # base ffmpeg version
 KODI_FFMPEG_REPO="https://github.com/xbmc/FFmpeg"
-KODI_FFMPEG_VERSION="4.3.1-Matrix-Alpha1-1"
+KODI_FFMPEG_VERSION="4.3.2-Matrix-19.1"
 
 ALL_FEATURE_SETS="v4l2-drmprime v4l2-request libreelec rpi"
 
@@ -37,7 +37,7 @@ create_patch() {
       ;;
     rpi)
       REPO="https://github.com/jc-kynesim/rpi-ffmpeg"
-      REFSPEC="dev/4.3.1/drm_prime_1"
+      REFSPEC="dev/4.3.2/clean_3"
       ;;
     *)
       echo "illegal feature set ${FEATURE_SET}"