Commit c74b644f authored by Anusha Srivatsa's avatar Anusha Srivatsa

drm/i915/display: Change terminology for cdclk actions

No functional changes. Changing terminology in some
print statements. s/has_cdclk_squasher/has_cdclk_squash,
s/crawler/crawl and s/squasher/squash.

Cc: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarBalasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221025223042.138810-1-anusha.srivatsa@intel.com
parent b8ed5533
...@@ -1220,7 +1220,7 @@ static void skl_cdclk_uninit_hw(struct drm_i915_private *dev_priv) ...@@ -1220,7 +1220,7 @@ static void skl_cdclk_uninit_hw(struct drm_i915_private *dev_priv)
skl_set_cdclk(dev_priv, &cdclk_config, INVALID_PIPE); skl_set_cdclk(dev_priv, &cdclk_config, INVALID_PIPE);
} }
static bool has_cdclk_squasher(struct drm_i915_private *i915) static bool has_cdclk_squash(struct drm_i915_private *i915)
{ {
return IS_DG2(i915); return IS_DG2(i915);
} }
...@@ -1520,7 +1520,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, ...@@ -1520,7 +1520,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
return; return;
} }
if (has_cdclk_squasher(dev_priv)) if (has_cdclk_squash(dev_priv))
squash_ctl = intel_de_read(dev_priv, CDCLK_SQUASH_CTL); squash_ctl = intel_de_read(dev_priv, CDCLK_SQUASH_CTL);
if (squash_ctl & CDCLK_SQUASH_ENABLE) { if (squash_ctl & CDCLK_SQUASH_ENABLE) {
...@@ -1747,7 +1747,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, ...@@ -1747,7 +1747,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
else else
clock = cdclk; clock = cdclk;
if (has_cdclk_squasher(dev_priv)) { if (has_cdclk_squash(dev_priv)) {
u32 squash_ctl = 0; u32 squash_ctl = 0;
if (waveform) if (waveform)
...@@ -1845,7 +1845,7 @@ static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv) ...@@ -1845,7 +1845,7 @@ static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv)
expected = skl_cdclk_decimal(cdclk); expected = skl_cdclk_decimal(cdclk);
/* Figure out what CD2X divider we should be using for this cdclk */ /* Figure out what CD2X divider we should be using for this cdclk */
if (has_cdclk_squasher(dev_priv)) if (has_cdclk_squash(dev_priv))
clock = dev_priv->display.cdclk.hw.vco / 2; clock = dev_priv->display.cdclk.hw.vco / 2;
else else
clock = dev_priv->display.cdclk.hw.cdclk; clock = dev_priv->display.cdclk.hw.cdclk;
...@@ -1976,7 +1976,7 @@ static bool intel_cdclk_can_squash(struct drm_i915_private *dev_priv, ...@@ -1976,7 +1976,7 @@ static bool intel_cdclk_can_squash(struct drm_i915_private *dev_priv,
* the moment all platforms with squasher use a fixed cd2x * the moment all platforms with squasher use a fixed cd2x
* divider. * divider.
*/ */
if (!has_cdclk_squasher(dev_priv)) if (!has_cdclk_squash(dev_priv))
return false; return false;
return a->cdclk != b->cdclk && return a->cdclk != b->cdclk &&
...@@ -2028,7 +2028,7 @@ static bool intel_cdclk_can_cd2x_update(struct drm_i915_private *dev_priv, ...@@ -2028,7 +2028,7 @@ static bool intel_cdclk_can_cd2x_update(struct drm_i915_private *dev_priv,
* the moment all platforms with squasher use a fixed cd2x * the moment all platforms with squasher use a fixed cd2x
* divider. * divider.
*/ */
if (has_cdclk_squasher(dev_priv)) if (has_cdclk_squash(dev_priv))
return false; return false;
return a->cdclk != b->cdclk && return a->cdclk != b->cdclk &&
...@@ -2754,12 +2754,12 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) ...@@ -2754,12 +2754,12 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
&old_cdclk_state->actual, &old_cdclk_state->actual,
&new_cdclk_state->actual)) { &new_cdclk_state->actual)) {
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"Can change cdclk via squasher\n"); "Can change cdclk via squashing\n");
} else if (intel_cdclk_can_crawl(dev_priv, } else if (intel_cdclk_can_crawl(dev_priv,
&old_cdclk_state->actual, &old_cdclk_state->actual,
&new_cdclk_state->actual)) { &new_cdclk_state->actual)) {
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"Can change cdclk via crawl\n"); "Can change cdclk via crawling\n");
} else if (pipe != INVALID_PIPE) { } else if (pipe != INVALID_PIPE) {
new_cdclk_state->pipe = pipe; new_cdclk_state->pipe = pipe;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment