Merge pull request #4562 from HiassofT/le10-kernel-5.9

linux (RPi): update to 5.9

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="a34f263ce6a9e35f3c1d62f6195f9f45f4f547e7"
+PKG_VERSION="63b192231130f1bdd074f3ae0794889d53bdeb06"
-PKG_SHA256="063374702cfc4cb3056160c9a793d001ae152e7ea5ee72bf0bfe230cb8bf31d2"
+PKG_SHA256="74c30be642467451dc440a39ef3ebb7e2ecaaf02c8521958493538f7f0e406f1"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"

packages/linux/package.mk

@@ -16,8 +16,8 @@ PKG_PATCH_DIRS="$LINUX"
 
 case "$LINUX" in
   raspberrypi)
-    PKG_VERSION="2ce8c3ab0f9d1ffb67310ffd200be82d80a8d13d" # 5.4.61
+    PKG_VERSION="81e7dd9fa134602e9313a18f96fa26990f9611af" # 5.9
-    PKG_SHA256="4e008bdb25d8d49223a1cd01cd5d5d882f511a7c6635a14f0a5100dd4a5e25ea"
+    PKG_SHA256="e73b70f5b02842d48ebae59adc033e57c1d5eb30fa964e85aa78d45136698b1a"
     PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;

packages/linux/patches/default/linux-051-ouya_controller_support.patch

@@ -21,7 +21,7 @@ index 60252fd796f6..6be2c454e72e 100644
 +config HID_OUYA
 +	tristate "OUYA Game Controller"
 +	depends on USB_HID
-+	---help---
++	help
 +	  Support for OUYA Game Controller.
 +
  config HID_PANTHERLORD

packages/linux/patches/raspberrypi/linux-0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch

@@ -1,66 +0,0 @@
-From 168200b6d6ea0cb5765943ec5da5b8149701f36a Mon Sep 17 00:00:00 2001
-From: Leo Yan <leo.yan@linaro.org>
-Date: Tue, 5 May 2020 21:36:42 +0800
-Subject: [PATCH] perf cs-etm: Move definition of 'traceid_list' global
- variable from header file
-
-The variable 'traceid_list' is defined in the header file cs-etm.h,
-if multiple C files include cs-etm.h the compiler might complaint for
-multiple definition of 'traceid_list'.
-
-To fix multiple definition error, move the definition of 'traceid_list'
-into cs-etm.c.
-
-Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata")
-Reported-by: Thomas Backlund <tmb@mageia.org>
-Signed-off-by: Leo Yan <leo.yan@linaro.org>
-Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-Reviewed-by: Mike Leach <mike.leach@linaro.org>
-Tested-by: Mike Leach <mike.leach@linaro.org>
-Tested-by: Thomas Backlund <tmb@mageia.org>
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Cc: Jiri Olsa <jolsa@redhat.com>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: Namhyung Kim <namhyung@kernel.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
-Cc: Tor Jeremiassen <tor@ti.com>
-Cc: linux-arm-kernel@lists.infradead.org
-Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
- tools/perf/util/cs-etm.c | 3 +++
- tools/perf/util/cs-etm.h | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
-index 3c802fde4954..c283223fb31f 100644
---- a/tools/perf/util/cs-etm.c
-+++ b/tools/perf/util/cs-etm.c
-@@ -94,6 +94,9 @@ struct cs_etm_queue {
- 	struct cs_etm_traceid_queue **traceid_queues;
- };
- 
-+/* RB tree for quick conversion between traceID and metadata pointers */
-+static struct intlist *traceid_list;
-+
- static int cs_etm__update_queues(struct cs_etm_auxtrace *etm);
- static int cs_etm__process_queues(struct cs_etm_auxtrace *etm);
- static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm,
-diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
-index 650ecc2a6349..4ad925d6d799 100644
---- a/tools/perf/util/cs-etm.h
-+++ b/tools/perf/util/cs-etm.h
-@@ -114,9 +114,6 @@ enum cs_etm_isa {
- 	CS_ETM_ISA_T32,
- };
- 
--/* RB tree for quick conversion between traceID and metadata pointers */
--struct intlist *traceid_list;
--
- struct cs_etm_queue;
- 
- struct cs_etm_packet {
--- 
-2.27.0
-

packages/linux/patches/raspberrypi/linux-010-hide-4k-modes.patch

@@ -1,4 +1,4 @@
-From 11c0cfc8ed33cda1435fc9a9efd8476514054842 Mon Sep 17 00:00:00 2001
+From dafb32ca693b99d491406a151ca00c297d6b2b59 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 16 Mar 2020 20:38:37 +0000
 Subject: [PATCH] vc4_hdmi: Reduce max pixel rate to hide 4k modes
@@ -9,22 +9,22 @@ vc4_hdmi: Increase pixel clock to 162MHz for 1920x1200@60
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 219964ff2f0e7..31d7565d2d904 100644
+index 83aaca83239fb..b9e26c3dc3fb1 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2322,7 +2322,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = {
+@@ -2378,7 +2378,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
- static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
+ 	.encoder_type		= VC4_ENCODER_TYPE_HDMI0,
- 	.id			= 0,
+ 	.debugfs_name		= "hdmi0_regs",
- 	.audio_available	= true,
+ 	.card_name		= "vc4-hdmi-0",
 -	.max_pixel_clock	= 297000000,
 +	.max_pixel_clock	= 162000000,
  	.cec_input_clock	= 27000000,
  	.registers		= vc5_hdmi_hdmi0_fields,
  	.num_registers		= ARRAY_SIZE(vc5_hdmi_hdmi0_fields),
-@@ -2350,7 +2350,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = {
+@@ -2407,7 +2407,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
- static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
+ 	.encoder_type		= VC4_ENCODER_TYPE_HDMI1,
- 	.id			= 1,
+ 	.debugfs_name		= "hdmi1_regs",
- 	.audio_available	= true,
+ 	.card_name		= "vc4-hdmi-1",
 -	.max_pixel_clock	= 297000000,
 +	.max_pixel_clock	= 162000000,
  	.cec_input_clock	= 27000000,

packages/linux/patches/raspberrypi/linux-051-ouya_controller_support.patch

@@ -21,7 +21,7 @@ index 60252fd796f6..6be2c454e72e 100644
 +config HID_OUYA
 +	tristate "OUYA Game Controller"
 +	depends on USB_HID
-+	---help---
++	help
 +	  Support for OUYA Game Controller.
 +
  config HID_PANTHERLORD

packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt

@@ -4,3 +4,4 @@
 # WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
 dtoverlay=vc4-kms-v3d
 disable_overscan=1
+disable_fw_kms_setup=1

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="a34f263ce6a9e35f3c1d62f6195f9f45f4f547e7"
+PKG_VERSION="63b192231130f1bdd074f3ae0794889d53bdeb06"
-PKG_SHA256="db698fb520c122a408330253d3720c8c3111108d47c4f82e097c718c4a98fdf7"
+PKG_SHA256="849cdc975e03d6eca18c4f29a7876879cd2dfe457539e81d39866079f4d3cf1d"
 PKG_ARCH="arm"
 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="b887a0bfa9f334a53bf1c66bbea5725b7a5f3846"
+PKG_VERSION="718820bcebd21d4a619fa262d9b9cf3acbf110f8"
-PKG_SHA256="400d64066c5ad31cbfd6f3fc146961a930060c2b97ef89ad48cd998aead2d7a3"
+PKG_SHA256="aa7ad6e93f31c48d43240b1695774a882c338b5945a2f4951fdbc1e1136b0688"
 PKG_ARCH="arm"
 PKG_LICENSE="BSD-3/custom"
 PKG_SITE="https://github.com/raspberrypi/rpi-eeprom"

packages/virtual/network/package.mk

@@ -24,10 +24,6 @@ fi
 
 if [ "$WIREGUARD_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools"
-  # projects using Linux 5.6+ can use the in-kernel module
-  if [ "$LINUX" = "raspberrypi" ]; then
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-linux-compat"
-  fi
 fi
 
 # nss needed by inputstream.adaptive, chromium etc.

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

@@ -4,3 +4,4 @@
 # WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
 dtoverlay=vc4-kms-v3d,cma-128
 disable_overscan=1
+disable_fw_kms_setup=1

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

@@ -2,6 +2,7 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 # WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!
-dtoverlay=vc4-kms-v3d-pi4,cma-size=402653184
+dtoverlay=vc4-kms-v3d-pi4,cma-384
 dtoverlay=rpivid-v4l2
 disable_overscan=1
+disable_fw_kms_setup=1

projects/RPi/devices/RPi4/kodi/appliance.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings version="1">
+
+  <section id="system">
+    <category id="audio">
+      <group id="1">
+        <setting id="audiooutput.audiodevice">
+          <default>ALSA:hdmi:CARD=vc4hdmi0,DEV=0</default>
+        </setting>
+      </group>
+    </category>
+  </section>
+
+</settings>

projects/RPi/devices/RPi4/patches/kodi/0003-popcornmix-pi4-hack-Try-to-hide-pixel-wrap-issue.patch

@@ -1,49 +0,0 @@
-From 48b41250d45c98ca19c8684bc5cdf4cde208c814 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 8 Apr 2020 11:19:22 +0100
-Subject: [PATCH 7/8] pi4: hack: Try to hide pixel wrap issue
-
----
- .../VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp   | 4 ++--
- xbmc/windowing/gbm/DRMAtomic.cpp                              | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-index bcb4badb9b..4aa0230460 100644
---- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VideoLayerBridgeDRMPRIME.cpp
-@@ -238,11 +238,11 @@ void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, cons
-   m_DRM->AddProperty(plane, "CRTC_ID", m_DRM->GetCrtc()->crtc->crtc_id);
-   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", (buffer->GetWidth()-2) << 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_W", (static_cast<uint32_t>(destRect.Width()) + 1) & ~1)-2;
-   m_DRM->AddProperty(plane, "CRTC_H", (static_cast<uint32_t>(destRect.Height()) + 1) & ~1);
- }
- 
-diff --git a/xbmc/windowing/gbm/DRMAtomic.cpp b/xbmc/windowing/gbm/DRMAtomic.cpp
-index 092ad3fc18..178705236c 100644
---- a/xbmc/windowing/gbm/DRMAtomic.cpp
-+++ b/xbmc/windowing/gbm/DRMAtomic.cpp
-@@ -69,11 +69,11 @@ void CDRMAtomic::DrmAtomicCommit(int fb_id, int flags, bool rendered, bool video
-     AddProperty(m_gui_plane, "CRTC_ID", m_crtc->crtc->crtc_id);
-     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", (m_width-2) << 16);
-     AddProperty(m_gui_plane, "SRC_H", m_height << 16);
-     AddProperty(m_gui_plane, "CRTC_X", 0);
-     AddProperty(m_gui_plane, "CRTC_Y", 0);
--    AddProperty(m_gui_plane, "CRTC_W", m_mode->hdisplay);
-+    AddProperty(m_gui_plane, "CRTC_W", m_mode->hdisplay-2);
-     AddProperty(m_gui_plane, "CRTC_H", m_mode->vdisplay);
-   }
-   else if (videoLayer && !CServiceBroker::GetGUI()->GetWindowManager().HasVisibleControls())
--- 
-2.20.1
-