Commit d7a14584 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Nuke the useless changed param from skl_ddb_add_affected_pipes()

changed==true just means we have some crtcs in the state. All the
stuff following this only operates on crtcs in the state anyway so
there is no point in having this bool.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191011200949.7839-2-ville.syrjala@linux.intel.comReviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
parent 98c93394
...@@ -5424,35 +5424,14 @@ skl_print_wm_changes(struct intel_atomic_state *state) ...@@ -5424,35 +5424,14 @@ skl_print_wm_changes(struct intel_atomic_state *state)
} }
static int static int
skl_ddb_add_affected_pipes(struct intel_atomic_state *state, bool *changed) skl_ddb_add_affected_pipes(struct intel_atomic_state *state)
{ {
struct drm_device *dev = state->base.dev; struct drm_device *dev = state->base.dev;
const struct drm_i915_private *dev_priv = to_i915(dev); const struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_crtc *crtc; struct intel_crtc *crtc;
struct intel_crtc_state *crtc_state; struct intel_crtc_state *crtc_state;
u32 realloc_pipes = pipes_modified(state); u32 realloc_pipes = pipes_modified(state);
int ret, i; int ret;
/*
* When we distrust bios wm we always need to recompute to set the
* expected DDB allocations for each CRTC.
*/
if (dev_priv->wm.distrust_bios_wm)
(*changed) = true;
/*
* If this transaction isn't actually touching any CRTC's, don't
* bother with watermark calculation. Note that if we pass this
* test, we're guaranteed to hold at least one CRTC state mutex,
* which means we can safely use values like dev_priv->active_pipes
* since any racing commits that want to update them would need to
* hold _all_ CRTC state mutexes.
*/
for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i)
(*changed) = true;
if (!*changed)
return 0;
/* /*
* If this is our first atomic update following hardware readout, * If this is our first atomic update following hardware readout,
...@@ -5576,14 +5555,13 @@ skl_compute_wm(struct intel_atomic_state *state) ...@@ -5576,14 +5555,13 @@ skl_compute_wm(struct intel_atomic_state *state)
struct intel_crtc_state *new_crtc_state; struct intel_crtc_state *new_crtc_state;
struct intel_crtc_state *old_crtc_state; struct intel_crtc_state *old_crtc_state;
struct skl_ddb_values *results = &state->wm_results; struct skl_ddb_values *results = &state->wm_results;
bool changed = false;
int ret, i; int ret, i;
/* Clear all dirty flags */ /* Clear all dirty flags */
results->dirty_pipes = 0; results->dirty_pipes = 0;
ret = skl_ddb_add_affected_pipes(state, &changed); ret = skl_ddb_add_affected_pipes(state);
if (ret || !changed) if (ret)
return ret; return ret;
/* /*
......
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