On Tue, Mar 10, 2015 at 10:13:52AM -0700, Matt Roper wrote: > On Tue, Mar 10, 2015 at 01:15:27PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > When enabling planes during .crtc_enable() we currently want to update > > the watermarks before enabling the planes. We already do it once just > > before enabling the pipe, but at that point out derived plane state is > > still out of whack, so we need to do it again after the .atomic_check() > > hooks have been called. > > > > What this means is now we could actually start to trust the derived > > plane state (clipped size, 'visible', etc.) in the watermark code. > > > > The pre pipe enable watermark update is supposed to be just make sure > > the other pipes are ready to have their FIFOs potentially reduced, so we > > need to keep it there as well. > > > > Since we don't yet have proper two-part watermark update leave the > > watermakrs alone in the plane disable case. This way they'll get updated > > only after the planes and pipe have all been turned off. > > > > Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Since I'm not sold on the atomic_check changes in your series I'll hold off on this one for now. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx