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>
This commit is contained in:
Dom Cobley
2024-10-14 18:55:00 +01:00
parent 93400a3380
commit c3ed2a535d
3 changed files with 9 additions and 0 deletions

View File

@@ -896,6 +896,8 @@ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
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);
@@ -3095,6 +3097,8 @@ static int vc4_hdmi_runtime_suspend(struct device *dev)
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;

View File

@@ -2149,7 +2149,10 @@ static void vc4_hvs_unbind(struct device *dev, struct device *master,
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;

View File

@@ -376,6 +376,8 @@ static int vc4_v3d_runtime_suspend(struct device *dev)
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;