From a0107603498cb0a925e5f4f576931bef87d382be Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 27 Oct 2022 11:47:13 +0000 Subject: [PATCH 1/3] linux: update to 6.0.6 --- 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 e18c493563..0289d06687 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -28,8 +28,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.0.3" - PKG_SHA256="b0d522241805794d8af3a67d331ba063a16496c6fb6d365d48f7ed78ee1c3dcf" + PKG_VERSION="6.0.6" + PKG_SHA256="864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From fcdb1299dbb486ca54ebc648bd737899a650f944 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 1 Nov 2022 01:33:52 +0000 Subject: [PATCH 2/3] linux (Allwinner): fix patch reverted with 6.0.3 In PR 7022 the upstream patch as below was reverted by commit - 53503ffc7b05cc6686ee070413e384a1189a112a. Reintroduce the upstream patch. -- https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c?h=v5.10.150&id=b70f8abc1a440be6802f27631ecb9acb0a158c66 Subject: [PATCH] WIP: drm/bridge: synopsys: Fix CEC not working after power-cyclying This fixes standby -> power-on on Rockchip platform for, at least, RK3288/RK3328/RK3399 where CEC wasn't working after powering on again. It might differ for other phy implementations: The whole HPD-detection part shoud be reworked and we should in general avoid to rely in RX_SENSE phy status (at least for HDMI), since it differs depending on sink's implementation. -- --- ...psys-Fix-CEC-not-working-after-power.patch | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch b/projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch index c8fcbb7b20..9c293098f4 100644 --- a/projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch +++ b/projects/Allwinner/patches/linux/0060-WIP-drm-bridge-synopsys-Fix-CEC-not-working-after-power.patch @@ -13,20 +13,14 @@ depending on sink's implementation. Signed-off-by: Alex Bee --- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 ++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 84cc52858ffb..3c20ef3bd3c1 100644 +index 92e621f2714f..7551e3ab77d6 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -@@ -3036,24 +3036,11 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) - * ask the source to re-read the EDID. - */ - if (intr_stat & -- (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) { -+ (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) - dw_hdmi_setup_rx_sense(hdmi, +@@ -3179,12 +3179,6 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) phy_stat & HDMI_PHY_HPD, phy_stat & HDMI_PHY_RX_SENSE); @@ -36,17 +30,10 @@ index 84cc52858ffb..3c20ef3bd3c1 100644 - mutex_unlock(&hdmi->cec_notifier_mutex); - } - -- if (phy_stat & HDMI_PHY_HPD) -- status = connector_status_connected; -- -- if (!(phy_stat & (HDMI_PHY_HPD | HDMI_PHY_RX_SENSE))) -- status = connector_status_disconnected; -- } -- - if (status != connector_status_unknown) { - dev_dbg(hdmi->dev, "EVENT=%s\n", - status == connector_status_connected ? -@@ -3061,6 +3054,14 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) + if (phy_stat & HDMI_PHY_HPD) + status = connector_status_connected; + +@@ -3201,6 +3195,14 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) drm_helper_hpd_irq_event(hdmi->bridge.dev); drm_bridge_hpd_notify(&hdmi->bridge, status); } From 0f0a98e9b69adccc8f98c6234b0602539ffff7ba Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 1 Nov 2022 07:16:00 +0000 Subject: [PATCH 3/3] iwlwifi-firmware: update to 2eb6baa --- packages/linux-firmware/iwlwifi-firmware/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/iwlwifi-firmware/package.mk b/packages/linux-firmware/iwlwifi-firmware/package.mk index b59ea95411..734aec6cd4 100644 --- a/packages/linux-firmware/iwlwifi-firmware/package.mk +++ b/packages/linux-firmware/iwlwifi-firmware/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iwlwifi-firmware" -PKG_VERSION="9c65a729599eda5cd4ffcae6acc64e00d2f8a058" -PKG_SHA256="d34bb99563f60ce6a1c1ca645da0a9dbf476a21230c58f5353c5db4472d5ed4e" +PKG_VERSION="2eb6baa08b3a3c9bf3f9f12ec6d9b94eca1d36e7" +PKG_SHA256="2641d8587536f646e28468dad6cda962fbdee9c45571075546135c4ca8776162" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware" PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz"