diff mbox series

[3/3] drm/i915: Remove dead update_wm_pre assignment from SKL wm code

Message ID 20181113172330.26069-3-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/3] drm/i915: Use explicit old crtc state in skl_compute_wm() | expand

Commit Message

Ville Syrjala Nov. 13, 2018, 5:23 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
point it setting it. crtc_state->update_wm_pre only exists as a
temporary hack for pre-g4x platforms until we redo their
watermarks to be be atomic.

Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Rodrigo Vivi Nov. 30, 2018, 6:30 a.m. UTC | #1 
On Tue, Nov 13, 2018 at 07:23:30PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
> point it setting it. crtc_state->update_wm_pre only exists as a
> temporary hack for pre-g4x platforms until we redo their
> watermarks to be be atomic.
> 
> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 5d823bdc63a9..9801412062cc 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5473,12 +5473,6 @@ skl_compute_wm(struct drm_atomic_state *state)
>  
>  		if (changed)
>  			results->dirty_pipes |= drm_crtc_mask(crtc);
> -
> -		if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
> -			/* This pipe's WM's did not change */
> -			continue;
> -
> -		intel_cstate->update_wm_pre = true;
>  	}
>  
>  	skl_print_wm_changes(state);
> -- 
> 2.18.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Ville Syrjala Dec. 7, 2018, 6:47 p.m. UTC | #2 
On Thu, Nov 29, 2018 at 10:30:37PM -0800, Rodrigo Vivi wrote:
> On Tue, Nov 13, 2018 at 07:23:30PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > SKL+ do not use crtc_state->update_wm_pre, so there is absolutely no
> > point it setting it. crtc_state->update_wm_pre only exists as a
> > temporary hack for pre-g4x platforms until we redo their
> > watermarks to be be atomic.
> > 
> > Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Thanks. Series pushed.

> 
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 6 ------
> >  1 file changed, 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 5d823bdc63a9..9801412062cc 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -5473,12 +5473,6 @@ skl_compute_wm(struct drm_atomic_state *state)
> >  
> >  		if (changed)
> >  			results->dirty_pipes |= drm_crtc_mask(crtc);
> > -
> > -		if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
> > -			/* This pipe's WM's did not change */
> > -			continue;
> > -
> > -		intel_cstate->update_wm_pre = true;
> >  	}
> >  
> >  	skl_print_wm_changes(state);
> > -- 
> > 2.18.1
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5d823bdc63a9..9801412062cc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5473,12 +5473,6 @@  skl_compute_wm(struct drm_atomic_state *state)
 
 		if (changed)
 			results->dirty_pipes |= drm_crtc_mask(crtc);
-
-		if ((results->dirty_pipes & drm_crtc_mask(crtc)) == 0)
-			/* This pipe's WM's did not change */
-			continue;
-
-		intel_cstate->update_wm_pre = true;
 	}
 
 	skl_print_wm_changes(state);