From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] drm/i915: Suppress hotplug work during PM suspend/resume Date: Thu, 10 May 2012 08:34:43 +0200 Message-ID: References: <1334858104.32618.28.camel@atropine> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id B6E66A0883 for ; Wed, 9 May 2012 23:34:44 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Adam Jackson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org At Wed, 25 Apr 2012 10:14:51 +0200, Takashi Iwai wrote: > > At Thu, 19 Apr 2012 20:11:53 +0200, > Takashi Iwai wrote: > > > > At Thu, 19 Apr 2012 13:55:04 -0400, > > Adam Jackson 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: > > > > Signed-off-by: Takashi Iwai > > > > > > This seems simpler (untested): > > > > This looks promising. I'll ask a test with your patch. > > Tester reported a positive feedback. But he also experienced with a > blank screen after a couple of S4 resumes. Now it's being checked > whether it's a regression by the patch or not. It seems unrelated with the patch itself. So, from my side, Reviewed-by: Takashi Iwai Adam, could you resubmit it with a proper sign-off so that it can be merged for 3.4 or 3.5, preferably with Cc to stable kernel? thanks, Takashi > > The machine has a problem with S3 anyway, also showing a blank screen > after S3 resume. So, the problem is likely irrelevant from your > patch, but just to be sure. > > > thanks, > > Takashi > > > > > > > thanks, > > > > Takashi > > > > > > > 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); > > > > > > - ajax > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >