target/linux/bcm27xx/patches-5.10/950-0577-vc4-drm-hdmi-Handle-case-when-bvb-clock-is-null.patch

   1 From 33e8e066af31c3af1d18d615f5e8ab5e528e0000 Mon Sep 17 00:00:00 2001
   2 From: Dom Cobley <popcornmix@gmail.com>
   3 Date: Wed, 21 Apr 2021 15:15:42 +0100
   4 Subject: [PATCH] vc4/drm: hdmi: Handle case when bvb clock is null
   5
   6 Pi2/3 have no bvb clock but want the other clocks to remain enabled here
   7
   8 See: https://github.com/raspberrypi/linux/issues/4299
   9 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  10 ---
  11  drivers/gpu/drm/vc4/vc4_hdmi.c | 9 ++++++---
  12  1 file changed, 6 insertions(+), 3 deletions(-)
  13
  14 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  15 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  16 @@ -608,7 +608,8 @@ static void vc4_hdmi_encoder_post_crtc_p
  17                    HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
  18
  19         clk_disable_unprepare(vc4_hdmi->pixel_bvb_clock);
  20 -       clk_request_done(vc4_hdmi->bvb_req);
  21 +       if (vc4_hdmi->bvb_req)
  22 +               clk_request_done(vc4_hdmi->bvb_req);
  23         clk_disable_unprepare(vc4_hdmi->hsm_clock);
  24         clk_request_done(vc4_hdmi->hsm_req);
  25         clk_disable_unprepare(vc4_hdmi->pixel_clock);
  26 @@ -932,7 +933,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
  27         else
  28                 bvb_rate = 75000000;
  29
  30 -       vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
  31 +       if (vc4_hdmi->pixel_bvb_clock)
  32 +               vc4_hdmi->bvb_req = clk_request_start(vc4_hdmi->pixel_bvb_clock, bvb_rate);
  33         if (IS_ERR(vc4_hdmi->bvb_req)) {
  34                 DRM_ERROR("Failed to set pixel bvb clock rate: %ld\n", PTR_ERR(vc4_hdmi->bvb_req));
  35                 clk_request_done(vc4_hdmi->hsm_req);
  36 @@ -944,7 +946,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
  37         ret = clk_prepare_enable(vc4_hdmi->pixel_bvb_clock);
  38         if (ret) {
  39                 DRM_ERROR("Failed to turn on pixel bvb clock: %d\n", ret);
  40 -               clk_request_done(vc4_hdmi->bvb_req);
  41 +               if (vc4_hdmi->bvb_req)
  42 +                       clk_request_done(vc4_hdmi->bvb_req);
  43                 clk_request_done(vc4_hdmi->hsm_req);
  44                 clk_disable_unprepare(vc4_hdmi->hsm_clock);
  45                 clk_disable_unprepare(vc4_hdmi->pixel_clock);