diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch b/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch new file mode 100644 index 0000000000..ec225841b4 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0667-drm-vc4-hdmi-Put-the-device-on-error-in-pre_crtc_con.patch @@ -0,0 +1,65 @@ +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 +@@ -900,6 +900,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; + } + +@@ -907,12 +908,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; + } + +@@ -920,6 +923,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; + } + +@@ -941,6 +945,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; + } + +@@ -952,6 +957,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; + } + |