mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
From 94bc403a9a7af3bd042ecdc160e6ab0b08331df8 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 2 Jul 2021 12:03:28 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Make sure the controller is powered up during
|
|
bind
|
|
|
|
In the bind hook, we actually need the device to have the HSM clock
|
|
running during the final part of the display initialisation where we
|
|
reset the controller and initialise the CEC component.
|
|
|
|
Failing to do so will result in a complete, silent, hang of the CPU.
|
|
|
|
Fixes: 411efa18e4b0 ("drm/vc4: hdmi: Move the HSM clock enable to runtime_pm")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +++++++++++++++--
|
|
1 file changed, 15 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2304,6 +2304,18 @@ static int vc4_hdmi_bind(struct device *
|
|
if (ret)
|
|
goto err_put_ddc;
|
|
|
|
+ /*
|
|
+ * We need to have the device powered up at this point to call
|
|
+ * our reset hook and for the CEC init.
|
|
+ */
|
|
+ ret = vc4_hdmi_runtime_resume(dev);
|
|
+ if (ret)
|
|
+ goto err_put_ddc;
|
|
+
|
|
+ pm_runtime_get_noresume(dev);
|
|
+ pm_runtime_set_active(dev);
|
|
+ pm_runtime_enable(dev);
|
|
+
|
|
if (vc4_hdmi->variant->reset)
|
|
vc4_hdmi->variant->reset(vc4_hdmi);
|
|
|
|
@@ -2315,8 +2327,6 @@ static int vc4_hdmi_bind(struct device *
|
|
clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
|
|
}
|
|
|
|
- pm_runtime_enable(dev);
|
|
-
|
|
drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);
|
|
drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs);
|
|
|
|
@@ -2340,6 +2350,8 @@ static int vc4_hdmi_bind(struct device *
|
|
vc4_hdmi_debugfs_regs,
|
|
vc4_hdmi);
|
|
|
|
+ pm_runtime_put_sync(dev);
|
|
+
|
|
return 0;
|
|
|
|
err_free_cec:
|
|
@@ -2350,6 +2362,7 @@ err_destroy_conn:
|
|
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
|
|
err_destroy_encoder:
|
|
drm_encoder_cleanup(encoder);
|
|
+ pm_runtime_put_sync(dev);
|
|
pm_runtime_disable(dev);
|
|
err_put_ddc:
|
|
put_device(&vc4_hdmi->ddc->dev);
|