[Intel-gfx] [PATCH 06/24] drm/i915: Disable/enable planes as the first/last thing during modeset on ILK+

[Daniel Vetter]

On Mon, Apr 07, 2014 at 04:51:21PM -0300, Paulo Zanoni wrote:
> 2014-03-07 13:32 GMT-03:00  <ville.syrjala at linux.intel.com>:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> > We already do this for HSW, but doing it makes sense for everything else
> > as well. Extend it for ILK/SNB/IVB since that's where the new watermark
> > code is used.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

I've frobbed the conflict and added the bz link for the vblank wait
warnings which this should fix. Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch