mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
|
From 0da58dfbd2cc2cfa14a629787b9ba6fa10b5f666 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Wed, 29 Mar 2023 15:26:52 +0100
|
||
|
|
Subject: [PATCH 0931/1016] drm/vc4: hdmi: Enable the audio clock
|
||
|
|
|
||
|
|
The audio clock is used by the HDMI controller driver and we were using
|
||
|
|
it to get its audio rate and compute the dividers needed to reach a
|
||
|
|
given audio sample rate.
|
||
|
|
|
||
|
|
However, we were never enabling it, which was resulting in lockups on
|
||
|
|
the BCM2712.
|
||
|
|
|
||
|
|
Fixes: 632ee3aa8786 ("drm/vc4: hdmi: Add audio-related callbacks")
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||
|
|
index 446a278fda77..04a722cbbef8 100644
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||
|
|
@@ -3625,6 +3625,7 @@ 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);
|
||
|
|
clk_disable_unprepare(vc4_hdmi->hsm_rpm_clock);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
@@ -3666,6 +3667,10 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
|
||
|
|
goto err_disable_clk;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ ret = clk_prepare_enable(vc4_hdmi->audio_clock);
|
||
|
|
+ if (ret)
|
||
|
|
+ goto err_disable_clk;
|
||
|
|
+
|
||
|
|
if (vc4_hdmi->variant->reset)
|
||
|
|
vc4_hdmi->variant->reset(vc4_hdmi);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|