git.openwrt.org Git - openwrt/staging/ldir.git/blob

   1 From 8865bc13c5e22daa653ce4c1c419a6efaa701dac Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Fri, 2 Jul 2021 17:44:56 +0200
   4 Subject: [PATCH] drm/vc4: hdmi: Add missing clk_disable_unprepare on
   5  error path
   6
   7 In vc4_hdmi_encoder_pre_crtc_configure, if clk_request_start for the HSM
   8 clock fails, we don't call clk_disable_unprepare on the pixel clock even
   9 though it's enabled by now.
  10
  11 Make sure it's there to avoid leaking that reference.
  12
  13 Fixes: cd4cb49dc5bb ("drm/vc4: hdmi: Adjust HSM clock rate depending on pixel rate")
  14 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  15 ---
  16  drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
  17  1 file changed, 1 insertion(+)
  18
  19 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  20 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  21 @@ -923,6 +923,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
  22         vc4_hdmi->hsm_req = clk_request_start(vc4_hdmi->hsm_clock, hsm_rate);
  23         if (IS_ERR(vc4_hdmi->hsm_req)) {
  24                 DRM_ERROR("Failed to set HSM clock rate: %ld\n", PTR_ERR(vc4_hdmi->hsm_req));
  25 +               clk_disable_unprepare(vc4_hdmi->pixel_clock);
  26                 pm_runtime_put(&vc4_hdmi->pdev->dev);
  27                 return;
  28         }