mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +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
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
From 60ed238e2225599540e47a95ecf50313cca9459e Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Tue, 29 Jun 2021 11:36:38 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Put the device on error in
|
|
pre_crtc_configure
|
|
|
|
In the vc4_hdmi_encoder_pre_crtc_configure() function error path we
|
|
never actually call pm_runtime_put() even though
|
|
pm_runtime_resume_and_get() is our very first call.
|
|
|
|
Fixes: 4f6e3d66ac52 ("drm/vc4: Add runtime PM support to the HDMI encoder driver")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -901,6 +901,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
|
|
if (ret < 0) {
|
|
DRM_ERROR("Failed to retain power domain: %d\n", ret);
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|
|
@@ -908,12 +909,14 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
ret = clk_set_rate(vc4_hdmi->pixel_clock, pixel_rate);
|
|
if (ret) {
|
|
DRM_ERROR("Failed to set pixel clock rate: %d\n", ret);
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|
|
ret = clk_prepare_enable(vc4_hdmi->pixel_clock);
|
|
if (ret) {
|
|
DRM_ERROR("Failed to turn on pixel clock: %d\n", ret);
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|
|
@@ -921,6 +924,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
vc4_hdmi->hsm_req = clk_request_start(vc4_hdmi->hsm_clock, hsm_rate);
|
|
if (IS_ERR(vc4_hdmi->hsm_req)) {
|
|
DRM_ERROR("Failed to set HSM clock rate: %ld\n", PTR_ERR(vc4_hdmi->hsm_req));
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|
|
@@ -942,6 +946,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
clk_request_done(vc4_hdmi->hsm_req);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|
|
@@ -953,6 +958,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
|
|
clk_request_done(vc4_hdmi->hsm_req);
|
|
clk_disable_unprepare(vc4_hdmi->hsm_clock);
|
|
clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
+ pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|
|
|