Skip to content

Commit 3e85b81

Browse files
committed
drm/vc4: hdmi: Set a default HSM rate
When the firmware doesn't setup the HSM rate (such as when booting without an HDMI cable plugged in), its rate is 0 and thus any register access results in a CPU stall, even though HSM is enabled. Let's enforce a minimum rate at boot to avoid this issue. Fixes: 4f6e3d6 ("drm/vc4: Add runtime PM support to the HDMI encoder driver") Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org> Tested-by: Nicolas Saenz Julienne <nsaenz@kernel.org> Tested-by: Michael Stapelberg <michael@stapelberg.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210922125419.4125779-4-maxime@cerno.tech
1 parent 8ca011e commit 3e85b81

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
# define VC4_HD_M_SW_RST BIT(2)
9595
# define VC4_HD_M_ENABLE BIT(0)
9696

97+
#define HSM_MIN_CLOCK_FREQ 120000000
9798
#define CEC_CLOCK_FREQ 40000
9899

99100
#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000)
@@ -2170,6 +2171,19 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
21702171
vc4_hdmi->disable_4kp60 = true;
21712172
}
21722173

2174+
/*
2175+
* If we boot without any cable connected to the HDMI connector,
2176+
* the firmware will skip the HSM initialization and leave it
2177+
* with a rate of 0, resulting in a bus lockup when we're
2178+
* accessing the registers even if it's enabled.
2179+
*
2180+
* Let's put a sensible default at runtime_resume so that we
2181+
* don't end up in this situation.
2182+
*/
2183+
ret = clk_set_min_rate(vc4_hdmi->hsm_clock, HSM_MIN_CLOCK_FREQ);
2184+
if (ret)
2185+
goto err_put_ddc;
2186+
21732187
if (vc4_hdmi->variant->reset)
21742188
vc4_hdmi->variant->reset(vc4_hdmi);
21752189

0 commit comments

Comments
 (0)