mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-02 20:16:59 +00:00
5158e28769
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.64 Manually rebased: generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch bcm27xx/patches-6.6/950-0610-drm-vc4-hvs-Support-BCM2712-HVS.patch bcm27xx/patches-6.6/950-0829-vc4-hvs-Add-support-for-D0-register-changes.patch Removed upstreamed: bcm27xx/patches-6.6/950-0597-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch[1] bcm27xx/patches-6.6/950-0599-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch[2] bcm27xx/patches-6.6/950-0600-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch[3] bcm27xx/patches-6.6/950-0708-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch[4] ramips/patches-6.6/002-01-v6.13-clk-ralink-mtmips-fix-clock-plan-for-Ralink-SoC-RT38.patch[5] ramips/patches-6.6/002-02-v6.13-clk-ralink-mtmips-fix-clocks-probe-order-in-oldest-r.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=223ee2567a55e4f80315c768d2969e6a3b9fb23d 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=8182b5ca19c6f173b6498d1c6d3e4b034b76bbde 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=52c1716f65a558174e381360bd88f18dae4be85c 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=9728b508b01a5eeeac79ceb676364c674dd951ac 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=f85a1d06afbcc57ac44176db8f9d7a934979952c 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=fbb13732c6ffa9d58cedafabcd5ce8fd7ef8ae5a Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Co-authored-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/17217 Signed-off-by: Robert Marko <robimarko@gmail.com>
75 lines
2.3 KiB
Diff
75 lines
2.3 KiB
Diff
From 18d185166ca00c9280505ad41fbe036efbb52e67 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Mon, 14 Oct 2024 18:55:00 +0100
|
|
Subject: [PATCH 1323/1350] drm/vc4: Remove request for min clocks when hdmi
|
|
output is disabled
|
|
|
|
Currently, booting with no hdmi connected has:
|
|
pi@pi4:~ $ vcgencmd measure_clock hdmi pixel
|
|
frequency(9)=120010256
|
|
frequency(29)=74988280
|
|
|
|
After connecting hdmi we get:
|
|
pi@pi4:~ $ vcgencmd measure_clock hdmi pixel
|
|
frequency(9)=300005856
|
|
frequency(29)=149989744
|
|
|
|
and that persists after disconnecting hdmi
|
|
|
|
I can measure this on a power supply as 10mA@5.2V (52mW).
|
|
|
|
We should always remove clk_set_min_rate requests
|
|
when we no longer need them.
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 3 +++
|
|
drivers/gpu/drm/vc4/vc4_v3d.c | 2 ++
|
|
3 files changed, 9 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1224,6 +1224,8 @@ static void vc4_hdmi_encoder_post_crtc_p
|
|
if (vc4_hdmi->variant->phy_disable)
|
|
vc4_hdmi->variant->phy_disable(vc4_hdmi);
|
|
|
|
+ /* we no longer require a minimum clock rate */
|
|
+ clk_set_min_rate(vc4_hdmi->pixel_bvb_clock, 0);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
|
|
@@ -3724,6 +3726,8 @@ static int vc4_hdmi_runtime_suspend(stru
|
|
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
|
|
|
|
clk_disable_unprepare(vc4_hdmi->audio_clock);
|
|
+ /* we no longer require a minimum clock rate */
|
|
+ clk_set_min_rate(vc4_hdmi->hsm_clock, 0);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
|
|
return 0;
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -2312,7 +2312,10 @@ static void vc4_hvs_unbind(struct device
|
|
drm_mm_remove_node(node);
|
|
drm_mm_takedown(&vc4->hvs->lbm_mm);
|
|
|
|
+ /* we no longer require a minimum clock rate */
|
|
+ clk_set_min_rate(hvs->disp_clk, 0);
|
|
clk_disable_unprepare(hvs->disp_clk);
|
|
+ clk_set_min_rate(hvs->core_clk, 0);
|
|
clk_disable_unprepare(hvs->core_clk);
|
|
|
|
vc4->hvs = NULL;
|
|
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
|
|
@@ -376,6 +376,8 @@ static int vc4_v3d_runtime_suspend(struc
|
|
|
|
vc4_irq_disable(&vc4->base);
|
|
|
|
+ /* we no longer require a minimum clock rate */
|
|
+ clk_set_min_rate(v3d->clk, 0);
|
|
clk_disable_unprepare(v3d->clk);
|
|
|
|
return 0;
|