Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drm/vc4: Remove request for min clocks when hdmi output is disabled #6416

Merged
merged 1 commit into from
Oct 15, 2024
Merged

drm/vc4: Remove request for min clocks when hdmi output is disabled #6416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/vc4/vc4_hvs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/vc4/vc4_v3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down