mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-04 21:14:21 +00:00
24d84a13a4
Manually rebased:
ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit d4aad642ff)
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 8865bc13c5e22daa653ce4c1c419a6efaa701dac Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 2 Jul 2021 17:44:56 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Add missing clk_disable_unprepare on
|
|
error path
|
|
|
|
In vc4_hdmi_encoder_pre_crtc_configure, if clk_request_start for the HSM
|
|
clock fails, we don't call clk_disable_unprepare on the pixel clock even
|
|
though it's enabled by now.
|
|
|
|
Make sure it's there to avoid leaking that reference.
|
|
|
|
Fixes: cd4cb49dc5bb ("drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -927,6 +927,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));
|
|
+ clk_disable_unprepare(vc4_hdmi->pixel_clock);
|
|
pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return;
|
|
}
|