On Fri, Mar 07, 2014 at 06:32:17PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > The new watermaek update mechanism requires interrupts to work > correctly. Because of this we need interrupts while disabling crtcs > during suspend. So move the irq disable to happen a bit later. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> I guess we have sufficient amounts of WARN_ON(!dev->irqs_enabled) sprinkled over relevant places already? Just want to start locking down our setup/teardown sequences as much as possible since making them more fancy and dynamic is an ongoing effort. -Daniel > --- > drivers/gpu/drm/i915/i915_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 658fe24..079fb904 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -448,7 +448,6 @@ static int i915_drm_freeze(struct drm_device *dev) > > cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); > > - drm_irq_uninstall(dev); > dev_priv->enable_hotplug_processing = false; > /* > * Disable CRTCs directly since we want to preserve sw state > @@ -459,6 +458,8 @@ static int i915_drm_freeze(struct drm_device *dev) > dev_priv->display.crtc_disable(crtc); > mutex_unlock(&dev->mode_config.mutex); > > + drm_irq_uninstall(dev); > + > intel_modeset_suspend_hw(dev); > } > > -- > 1.8.3.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- 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
