[1/8] drm/i915: Nuke the useless changed param from skl_ddb_add_affected_pipes()
diff mbox series

Message ID 20191011200949.7839-2-ville.syrjala@linux.intel.com
State New
Headers show
Series
  • drm/i915: Some cleanup near the SKL wm/ddb area
Related show

Commit Message

Ville Syrjälä Oct. 11, 2019, 8:09 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

Comments

Lisovskiy, Stanislav Oct. 16, 2019, 2:25 p.m. UTC | #1
On Fri, 2019-10-11 at 23:09 +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> 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: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 30 ++++--------------------------
>  1 file changed, 4 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index b306e2338f5a..49568270a89d 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5424,35 +5424,14 @@ skl_print_wm_changes(struct
> intel_atomic_state *state)
>  }
>  
>  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;
>  	const struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct intel_crtc *crtc;
>  	struct intel_crtc_state *crtc_state;
>  	u32 realloc_pipes = pipes_modified(state);
> -	int ret, i;
> -
> -	/*
> -	 * 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;
> +	int ret;
>  
>  	/*
>  	 * If this is our first atomic update following hardware
> readout,
> @@ -5576,14 +5555,13 @@ skl_compute_wm(struct intel_atomic_state
> *state)
>  	struct intel_crtc_state *new_crtc_state;
>  	struct intel_crtc_state *old_crtc_state;
>  	struct skl_ddb_values *results = &state->wm_results;
> -	bool changed = false;
>  	int ret, i;
>  
>  	/* Clear all dirty flags */
>  	results->dirty_pipes = 0;
>  
> -	ret = skl_ddb_add_affected_pipes(state, &changed);
> -	if (ret || !changed)
> +	ret = skl_ddb_add_affected_pipes(state);
> +	if (ret)
>  		return ret;
>  
>  	/*

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index b306e2338f5a..49568270a89d 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5424,35 +5424,14 @@  skl_print_wm_changes(struct intel_atomic_state *state)
 }
 
 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;
 	const struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_crtc *crtc;
 	struct intel_crtc_state *crtc_state;
 	u32 realloc_pipes = pipes_modified(state);
-	int ret, i;
-
-	/*
-	 * 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;
+	int ret;
 
 	/*
 	 * If this is our first atomic update following hardware readout,
@@ -5576,14 +5555,13 @@  skl_compute_wm(struct intel_atomic_state *state)
 	struct intel_crtc_state *new_crtc_state;
 	struct intel_crtc_state *old_crtc_state;
 	struct skl_ddb_values *results = &state->wm_results;
-	bool changed = false;
 	int ret, i;
 
 	/* Clear all dirty flags */
 	results->dirty_pipes = 0;
 
-	ret = skl_ddb_add_affected_pipes(state, &changed);
-	if (ret || !changed)
+	ret = skl_ddb_add_affected_pipes(state);
+	if (ret)
 		return ret;
 
 	/*