Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com> On Tue, Jun 4, 2013 at 7:49 AM, <ville.syrjala at linux.intel.com> wrote: > From: Ville Syrj?l? <ville.syrjala at linux.intel.com> > > First disable FBC, then IPS, then disable all planes, and finally > disable the pipe. > > v2: Mention IPS in the commit message > > Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 05510f5..dac2db7 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3383,13 +3383,13 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) > > intel_crtc_wait_for_pending_flips(crtc); > drm_vblank_off(dev, pipe); > - intel_crtc_update_cursor(crtc, false); > - > - intel_disable_plane(dev_priv, plane, pipe); > > if (dev_priv->cfb_plane == plane) > intel_disable_fbc(dev); > > + intel_crtc_update_cursor(crtc, false); > + intel_disable_plane(dev_priv, plane, pipe); > + > intel_set_pch_fifo_underrun_reporting(dev, pipe, false); > intel_disable_pipe(dev_priv, pipe); > > @@ -3462,7 +3462,6 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) > > intel_crtc_wait_for_pending_flips(crtc); > drm_vblank_off(dev, pipe); > - intel_crtc_update_cursor(crtc, false); > > /* FBC must be disabled before disabling the plane on HSW. */ > if (dev_priv->cfb_plane == plane) > @@ -3470,6 +3469,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) > > hsw_disable_ips(intel_crtc); > > + intel_crtc_update_cursor(crtc, false); > intel_disable_plane(dev_priv, plane, pipe); > > if (intel_crtc->config.has_pch_encoder) > @@ -3703,13 +3703,14 @@ static void i9xx_crtc_disable(struct drm_crtc *crtc) > /* Give the overlay scaler a chance to disable if it's on this pipe */ > intel_crtc_wait_for_pending_flips(crtc); > drm_vblank_off(dev, pipe); > - intel_crtc_dpms_overlay(intel_crtc, false); > - intel_crtc_update_cursor(crtc, false); > > if (dev_priv->cfb_plane == plane) > intel_disable_fbc(dev); > > + intel_crtc_dpms_overlay(intel_crtc, false); > + intel_crtc_update_cursor(crtc, false); > intel_disable_plane(dev_priv, plane, pipe); > + > intel_disable_pipe(dev_priv, pipe); > > i9xx_pfit_disable(intel_crtc); > -- > 1.8.1.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Rodrigo Vivi Blog: http://blog.vivi.eng.br
