[Intel-gfx] [PATCH 3/4] drm/i915/display: s/intel_cdclk_can_crawl/intel_cdclk_crawl

[Anusha Srivatsa]

Apart from checking if crawling can be performed,
accommodate accessing in-flight cdclk state for any changes
that are needed during commit phase.

Cc: Matt Roper <matthew.d.ro...@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.sriva...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c 
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 4081b880a6ef..cb6e419562dd 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1944,9 +1944,9 @@ void intel_cdclk_uninit_hw(struct drm_i915_private *i915)
                skl_cdclk_uninit_hw(i915);
 }
 
-static bool intel_cdclk_can_crawl(struct drm_i915_private *dev_priv,
-                                 const struct intel_cdclk_config *a,
-                                 const struct intel_cdclk_config *b)
+static bool intel_cdclk_crawl(struct drm_i915_private *dev_priv,
+                                 const struct intel_cdclk_state *a,
+                                 struct intel_cdclk_state *b)
 {
        int a_div, b_div;
 
@@ -1957,13 +1957,13 @@ static bool intel_cdclk_can_crawl(struct 
drm_i915_private *dev_priv,
         * The vco and cd2x divider will change independently
         * from each, so we disallow cd2x change when crawling.
         */
-       a_div = DIV_ROUND_CLOSEST(a->vco, a->cdclk);
-       b_div = DIV_ROUND_CLOSEST(b->vco, b->cdclk);
+       a_div = DIV_ROUND_CLOSEST(a->actual.vco, a->actual.cdclk);
+       b_div = DIV_ROUND_CLOSEST(b->actual.vco, b->actual.cdclk);
 
-       return a->vco != 0 && b->vco != 0 &&
-               a->vco != b->vco &&
+       return a->actual.vco != 0 && b->actual.vco != 0 &&
+               a->actual.vco != b->actual.vco &&
                a_div == b_div &&
-               a->ref == b->ref;
+               a->actual.ref == b->actual.ref;
 }
 
 static bool intel_cdclk_squash(struct drm_i915_private *dev_priv,
@@ -2764,9 +2764,9 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state 
*state)
                               new_cdclk_state)) {
                drm_dbg_kms(&dev_priv->drm,
                            "Can change cdclk via squasher\n");
-       } else if (intel_cdclk_can_crawl(dev_priv,
-                                        &old_cdclk_state->actual,
-                                        &new_cdclk_state->actual)) {
+       } else if (intel_cdclk_crawl(dev_priv,
+                                    old_cdclk_state,
+                                    new_cdclk_state)) {
                drm_dbg_kms(&dev_priv->drm,
                            "Can change cdclk via crawl\n");
        } else if (pipe != INVALID_PIPE) {
-- 
2.25.1