drm/i915: s/need_cd2x_updare/can_cd2x_update/
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 20 Jan 2020 17:47:16 +0000 (19:47 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 31 Jan 2020 15:00:43 +0000 (17:00 +0200)
intel_cdclk_needs_cd2x_update() is named rather confusingly.
We don't have to do a cd2x update, rather we are allowed to
do one (as opposed to a full PLL reprogramming with its heavy
handed modeset). So let's rename the function to
intel_cdclk_can_cd2x_update().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200120174728.21095-7-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
drivers/gpu/drm/i915/display/intel_cdclk.c

index 49263f7e3c214f9bd896759f9d8153175fcb1f70..f274b9ee8b1d4b7645d46abab238ed57714b114c 100644 (file)
@@ -1783,7 +1783,7 @@ bool intel_cdclk_needs_modeset(const struct intel_cdclk_state *a,
 }
 
 /**
- * intel_cdclk_needs_cd2x_update - Determine if two CDCLK states require a cd2x divider update
+ * intel_cdclk_can_cd2x_update - Determine if two CDCLK states need a cd2x divider update
  * @dev_priv: Not a CDCLK state, it's the drm_i915_private!
  * @a: first CDCLK state
  * @b: second CDCLK state
@@ -1791,9 +1791,9 @@ bool intel_cdclk_needs_modeset(const struct intel_cdclk_state *a,
  * Returns:
  * True if the CDCLK states require just a cd2x divider update, false if not.
  */
-static bool intel_cdclk_needs_cd2x_update(struct drm_i915_private *dev_priv,
-                                         const struct intel_cdclk_state *a,
-                                         const struct intel_cdclk_state *b)
+static bool intel_cdclk_can_cd2x_update(struct drm_i915_private *dev_priv,
+                                       const struct intel_cdclk_state *a,
+                                       const struct intel_cdclk_state *b)
 {
        /* Older hw doesn't have the capability */
        if (INTEL_GEN(dev_priv) < 10 && !IS_GEN9_LP(dev_priv))
@@ -2410,9 +2410,9 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
        }
 
        if (is_power_of_2(state->active_pipes) &&
-           intel_cdclk_needs_cd2x_update(dev_priv,
-                                         &dev_priv->cdclk.actual,
-                                         &state->cdclk.actual)) {
+           intel_cdclk_can_cd2x_update(dev_priv,
+                                       &dev_priv->cdclk.actual,
+                                       &state->cdclk.actual)) {
                struct intel_crtc *crtc;
                struct intel_crtc_state *crtc_state;