[Intel-gfx] [PATCH v2 12/13] drm/i915: Consolidate more cdclk state handling

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Move the initial setup of state->min_cdclk[]/min_voltage_level[]
into intel_modeset_calc_cdclk() alongside the rest of the global
cdclk state. And the counterparts we move into
intel_cdclk_swap_state().

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c   | 19 +++++++++++++------
 drivers/gpu/drm/i915/display/intel_display.c |  5 -----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c 
b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 27addbd35d9c..f6e2048dd2b8 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -1817,6 +1817,14 @@ void intel_cdclk_swap_state(struct intel_atomic_state 
*state)
 {
        struct drm_i915_private *dev_priv = to_i915(state->base.dev);
 
+       /* FIXME maybe swap() these too */
+       memcpy(dev_priv->min_cdclk, state->min_cdclk,
+              sizeof(state->min_cdclk));
+       memcpy(dev_priv->min_voltage_level, state->min_voltage_level,
+              sizeof(state->min_voltage_level));
+
+       dev_priv->cdclk.force_min_cdclk = state->cdclk.force_min_cdclk;
+
        swap(state->cdclk.logical, dev_priv->cdclk.logical);
        swap(state->cdclk.actual, dev_priv->cdclk.actual);
 }
@@ -2019,9 +2027,6 @@ static int intel_compute_min_cdclk(struct 
intel_atomic_state *state)
        int min_cdclk, i;
        enum pipe pipe;
 
-       memcpy(state->min_cdclk, dev_priv->min_cdclk,
-              sizeof(state->min_cdclk));
-
        for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
                int ret;
 
@@ -2068,9 +2073,6 @@ static int bxt_compute_min_voltage_level(struct 
intel_atomic_state *state)
        int i;
        enum pipe pipe;
 
-       memcpy(state->min_voltage_level, dev_priv->min_voltage_level,
-              sizeof(state->min_voltage_level));
-
        for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
                int ret;
 
@@ -2325,6 +2327,11 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state 
*state)
        enum pipe pipe;
        int ret;
 
+       memcpy(state->min_cdclk, dev_priv->min_cdclk,
+              sizeof(state->min_cdclk));
+       memcpy(state->min_voltage_level, dev_priv->min_voltage_level,
+              sizeof(state->min_voltage_level));
+
        /* keep the current setting */
        if (!state->cdclk.force_min_cdclk_changed)
                state->cdclk.force_min_cdclk = dev_priv->cdclk.force_min_cdclk;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 94fec0958f39..8e607dad87d3 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14453,12 +14453,7 @@ static int intel_atomic_commit(struct drm_device *dev,
        if (state->global_state_changed) {
                assert_global_state_locked(dev_priv);
 
-               memcpy(dev_priv->min_cdclk, state->min_cdclk,
-                      sizeof(state->min_cdclk));
-               memcpy(dev_priv->min_voltage_level, state->min_voltage_level,
-                      sizeof(state->min_voltage_level));
                dev_priv->active_pipes = state->active_pipes;
-               dev_priv->cdclk.force_min_cdclk = state->cdclk.force_min_cdclk;
 
                intel_cdclk_swap_state(state);
        }
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx