[PATCH 7/7] Revert "drm/i915: Extract cdclk requirements checking to separate function"
Chris Wilson
chris at chris-wilson.co.uk
Fri May 22 22:08:11 UTC 2020
This reverts commit 4f0b4352bd26eff85f972ccf12bcdf9236a42175.
---
drivers/gpu/drm/i915/display/intel_display.c | 30 ++++++--------------
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 1f15f910e51b..5c159228cbe6 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14645,7 +14645,8 @@ static bool active_planes_affects_min_cdclk(struct drm_i915_private *dev_priv)
IS_IVYBRIDGE(dev_priv);
}
-static int intel_atomic_check_planes(struct intel_atomic_state *state)
+static int intel_atomic_check_planes(struct intel_atomic_state *state,
+ bool *need_cdclk_calc)
{
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
@@ -14695,22 +14696,6 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
return ret;
}
- return 0;
-}
-
-static int intel_atomic_check_cdclk(struct intel_atomic_state *state,
- bool *need_cdclk_calc)
-{
- struct intel_cdclk_state *new_cdclk_state;
- int i;
- struct intel_plane_state *plane_state;
- struct intel_plane *plane;
- int ret;
-
- new_cdclk_state = intel_atomic_get_new_cdclk_state(state);
- if (new_cdclk_state && new_cdclk_state->force_min_cdclk_changed)
- *need_cdclk_calc = true;
-
/*
* active_planes bitmask has been updated, and potentially
* affected planes are part of the state. We can now
@@ -14773,6 +14758,7 @@ static int intel_atomic_check(struct drm_device *dev,
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_atomic_state *state = to_intel_atomic_state(_state);
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
+ struct intel_cdclk_state *new_cdclk_state;
struct intel_crtc *crtc;
int ret, i;
bool any_ms = false;
@@ -14883,10 +14869,14 @@ static int intel_atomic_check(struct drm_device *dev,
if (ret)
goto fail;
- ret = intel_atomic_check_planes(state);
+ ret = intel_atomic_check_planes(state, &any_ms);
if (ret)
goto fail;
+ new_cdclk_state = intel_atomic_get_new_cdclk_state(state);
+ if (new_cdclk_state && new_cdclk_state->force_min_cdclk_changed)
+ any_ms = true;
+
/*
* distrust_bios_wm will force a full dbuf recomputation
* but the hardware state will only get updated accordingly
@@ -14916,10 +14906,6 @@ static int intel_atomic_check(struct drm_device *dev,
if (ret)
goto fail;
- ret = intel_atomic_check_cdclk(state, &any_ms);
- if (ret)
- goto fail;
-
if (any_ms) {
ret = intel_modeset_calc_cdclk(state);
if (ret)
--
2.20.1
More information about the Intel-gfx-trybot
mailing list