On Thu, 19 Apr 2012 13:55:04 -0400, Adam Jackson <ajax at redhat.com> wrote: > On Thu, 2012-04-19 at 18:10 +0200, Takashi Iwai wrote: > > > This patch adds a flag to disable the hotplug during PM operation for > > avoiding such a race. > > > > Cc: <stable at kernel.org> > > Signed-off-by: Takashi Iwai <tiwai at suse.de> > > This seems simpler (untested): > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 1a7559b..1cd77a4 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -530,11 +530,12 @@ static int i915_drm_thaw(struct drm_device *dev) > ironlake_init_pch_refclk(dev); > > drm_mode_config_reset(dev); > - drm_irq_install(dev); > > /* Resume the modeset for every activated CRTC */ > drm_helper_resume_force_mode(dev); > > + drm_irq_install(dev); > + > if (IS_IRONLAKE_M(dev)) > ironlake_enable_rc6(dev); Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> -Chris -- Chris Wilson, Intel Open Source Technology Centre
