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

   1 From 0e5138afb28dbfd4f9004a48c879cf9c0d27f2b9 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Wed, 16 Mar 2022 09:52:34 +0100
   4 Subject: [PATCH] Revert "drm/vc4: hdmi: Convert to the new clock
   5  request API"
   6
   7 This reverts commit 5dbb9357519a9479eacdda130713bf0dc44e069c.
   8 ---
   9  drivers/gpu/drm/vc4/vc4_kms.c | 5 +----
  10  1 file changed, 1 insertion(+), 4 deletions(-)
  11
  12 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  13 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  14 @@ -355,7 +355,6 @@ static void vc4_atomic_commit_tail(struc
  15         struct drm_crtc *crtc;
  16         struct vc4_hvs_state *old_hvs_state;
  17         unsigned int channel;
  18 -       struct clk_request *core_req;
  19         int i;
  20
  21         old_hvs_state = vc4_hvs_get_old_global_state(state);
  22 @@ -401,7 +400,7 @@ static void vc4_atomic_commit_tail(struc
  23                 unsigned long core_rate = max_t(unsigned long,
  24                                                 500000000, state_rate);
  25
  26 -               core_req = clk_request_start(hvs->core_clk, core_rate);
  27 +               clk_set_min_rate(hvs->core_clk, core_rate);
  28         }
  29
  30         drm_atomic_helper_commit_modeset_disables(dev, state);
  31 @@ -433,8 +432,6 @@ static void vc4_atomic_commit_tail(struc
  32
  33                 clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate);
  34
  35 -               clk_request_done(core_req);
  36 -
  37                 drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
  38                         clk_get_rate(hvs->core_clk));
  39         }