[Intel-gfx] [PATCH 4/4] drm/i915: Only call commit_planes when there are things to commit.

[Daniel Vetter]

On Fri, Oct 16, 2015 at 03:47:37PM +0300, Ville Syrjälä wrote:
> On Wed, Sep 23, 2015 at 04:29:39PM +0200, Maarten Lankhorst wrote:
> > The atomic helpers set planes_changed on a crtc_state if there is
> > any plane_state bound to that crtc. If there's none and there is
> > no pipe update required the crtc has nothing to update, so vblank
> > evasion can be skipped.
> > 
> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index f64ea430b976..9754ee2bb37c 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -13146,7 +13146,8 @@ static int intel_atomic_commit(struct drm_device *dev,
> >  		if (!modeset)
> >  			intel_pre_plane_update(intel_crtc);
> >  
> > -		if (crtc->state->active)
> > +		if (crtc->state->active &&
> > +		    (crtc->state->planes_changed || update_pipe))
> >  			drm_atomic_helper_commit_planes_on_crtc(crtc_state);
> >  
> >  		if (put_domains)
> 
> Series lgtm
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

All four merged to dinq, thanks.
-Daniel

> 
> > -- 
> > 2.1.0
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch