diff options
| author | Dom Cobley <popcornmix@gmail.com> | 2024-10-14 18:55:00 +0100 |
|---|---|---|
| committer | Phil Elwell <8911409+pelwell@users.noreply.github.com> | 2024-10-15 19:57:01 +0100 |
| commit | 18d185166ca00c9280505ad41fbe036efbb52e67 (patch) | |
| tree | a2e86494931ec71c7b0827b0b92a1577e7529ed3 /drivers/gpu | |
| parent | 6f2d1b4c3132206de40247b604638a51277131fb (diff) | |
| download | linux-rpi-18d185166ca00c9280505ad41fbe036efbb52e67.tar.gz linux-rpi-18d185166ca00c9280505ad41fbe036efbb52e67.tar.bz2 linux-rpi-18d185166ca00c9280505ad41fbe036efbb52e67.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hvs.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_v3d.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index d33f599311e5..e1f2ce494241 100644 --- 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_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); @@ -3724,6 +3726,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; diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index fbb2bac60830..02a9bb43035d 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -2361,7 +2361,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; diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 14d268f80fa5..2fdeb76f05c0 100644 --- 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(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; |