From: Greg Kroah-Hartman Date: Mon, 24 Mar 2025 16:21:45 +0000 (-0700) Subject: drop some 6.1.y patches X-Git-Tag: v6.1.132~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4900e5454a87f136c90e780a0713450fe9e9f30f;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 6.1.y patches --- diff --git a/queue-6.1/arm-dts-imx6qdl-apalis-fix-poweroff-on-apalis-imx6.patch b/queue-6.1/arm-dts-imx6qdl-apalis-fix-poweroff-on-apalis-imx6.patch deleted file mode 100644 index 03ec029e51..0000000000 --- a/queue-6.1/arm-dts-imx6qdl-apalis-fix-poweroff-on-apalis-imx6.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 83964a29379cb08929a39172780a4c2992bc7c93 Mon Sep 17 00:00:00 2001 -From: Stefan Eichenberger -Date: Fri, 10 Jan 2025 16:18:29 +0100 -Subject: ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6 - -From: Stefan Eichenberger - -commit 83964a29379cb08929a39172780a4c2992bc7c93 upstream. - -The current solution for powering off the Apalis iMX6 is not functioning -as intended. To resolve this, it is necessary to power off the -vgen2_reg, which will also set the POWER_ENABLE_MOCI signal to a low -state. This ensures the carrier board is properly informed to initiate -its power-off sequence. - -The new solution uses the regulator-poweroff driver, which will power -off the regulator during a system shutdown. - -Cc: -Fixes: 4eb56e26f92e ("ARM: dts: imx6q-apalis: Command pmic to standby for poweroff") -Signed-off-by: Stefan Eichenberger -Signed-off-by: Shawn Guo -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi -index dffab5aa8b9c..88be29166c1a 100644 ---- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi -+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi -@@ -108,6 +108,11 @@ lvds_panel_in: endpoint { - }; - }; - -+ poweroff { -+ compatible = "regulator-poweroff"; -+ cpu-supply = <&vgen2_reg>; -+ }; -+ - reg_module_3v3: regulator-module-3v3 { - compatible = "regulator-fixed"; - regulator-always-on; -@@ -236,10 +241,6 @@ &can2 { - status = "disabled"; - }; - --&clks { -- fsl,pmic-stby-poweroff; --}; -- - /* Apalis SPI1 */ - &ecspi1 { - cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>; -@@ -527,7 +528,6 @@ &i2c2 { - - pmic: pmic@8 { - compatible = "fsl,pfuze100"; -- fsl,pmic-stby-poweroff; - reg = <0x08>; - - regulators { --- -2.49.0 - diff --git a/queue-6.1/drm-amd-display-should-support-dmub-hw-lock-on-replay.patch b/queue-6.1/drm-amd-display-should-support-dmub-hw-lock-on-replay.patch deleted file mode 100644 index 739be90c30..0000000000 --- a/queue-6.1/drm-amd-display-should-support-dmub-hw-lock-on-replay.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bfeefe6ea5f18cabb8fda55364079573804623f9 Mon Sep 17 00:00:00 2001 -From: Martin Tsai -Date: Fri, 2 Feb 2024 14:39:29 +0800 -Subject: drm/amd/display: should support dmub hw lock on Replay - -From: Martin Tsai - -commit bfeefe6ea5f18cabb8fda55364079573804623f9 upstream. - -[Why] -Without acquiring DMCUB hw lock, a race condition is caused with -Panel Replay feature, which will trigger a hang. Indicate that a -lock is necessary to prevent this when replay feature is enabled. - -[How] -To allow dmub hw lock on Replay. - -Reviewed-by: Robin Chen -Acked-by: Aurabindo Pillai -Signed-off-by: Martin Tsai -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c -+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c -@@ -67,5 +67,9 @@ bool should_use_dmub_lock(struct dc_link - { - if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) - return true; -+ -+ if (link->replay_settings.replay_feature_enabled) -+ return true; -+ - return false; - } diff --git a/queue-6.1/drm-amd-display-use-hw-lock-mgr-for-psr1-when-only-one-edp.patch b/queue-6.1/drm-amd-display-use-hw-lock-mgr-for-psr1-when-only-one-edp.patch deleted file mode 100644 index 2e1dd7b3c4..0000000000 --- a/queue-6.1/drm-amd-display-use-hw-lock-mgr-for-psr1-when-only-one-edp.patch +++ /dev/null @@ -1,53 +0,0 @@ -From acbf16a6ae775b4db86f537448cc466288aa307e Mon Sep 17 00:00:00 2001 -From: Mario Limonciello -Date: Fri, 7 Mar 2025 15:55:20 -0600 -Subject: drm/amd/display: Use HW lock mgr for PSR1 when only one eDP - -From: Mario Limonciello - -commit acbf16a6ae775b4db86f537448cc466288aa307e upstream. - -[WHY] -DMUB locking is important to make sure that registers aren't accessed -while in PSR. Previously it was enabled but caused a deadlock in -situations with multiple eDP panels. - -[HOW] -Detect if multiple eDP panels are in use to decide whether to use -lock. Refactor the function so that the first check is for PSR-SU -and then replay is in use to prevent having to look up number -of eDP panels for those configurations. - -Fixes: f245b400a223 ("Revert "drm/amd/display: Use HW lock mgr for PSR1"") -Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3965 -Reviewed-by: ChiaHsuan Chung -Signed-off-by: Mario Limonciello -Signed-off-by: Alex Hung -Tested-by: Daniel Wheeler -Signed-off-by: Alex Deucher -(cherry picked from commit ed569e1279a3045d6b974226c814e071fa0193a6) -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c -+++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c -@@ -71,5 +71,16 @@ bool should_use_dmub_lock(struct dc_link - if (link->replay_settings.replay_feature_enabled) - return true; - -+ /* only use HW lock for PSR1 on single eDP */ -+ if (link->psr_settings.psr_version == DC_PSR_VERSION_1) { -+ struct dc_link *edp_links[MAX_NUM_EDP]; -+ int edp_num; -+ -+ dc_get_edp_links(link->dc, edp_links, &edp_num); -+ -+ if (edp_num == 1) -+ return true; -+ } -+ - return false; - } diff --git a/queue-6.1/series b/queue-6.1/series index 169665746a..fb9ba710ae 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -187,6 +187,3 @@ batman-adv-ignore-own-maximum-aggregation-size-during-rx.patch soc-qcom-pdr-fix-the-potential-deadlock.patch drm-radeon-fix-uninitialized-size-issue-in-radeon_vce_cs_parse.patch drm-amdgpu-fix-jpeg-video-caps-max-size-for-navi1x-and-raven.patch -drm-amd-display-should-support-dmub-hw-lock-on-replay.patch -drm-amd-display-use-hw-lock-mgr-for-psr1-when-only-one-edp.patch -arm-dts-imx6qdl-apalis-fix-poweroff-on-apalis-imx6.patch