From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH] drm/i915: Suppress hotplug work during PM
	suspend/resume
Date: Thu, 10 May 2012 11:13:40 +0100
Message-ID: <1336644840_224018@CP5-2952>
References: <s5hlilr4s9h.wl%tiwai@suse.de> <1334858104.32618.28.camel@atropine>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236])
	by gabe.freedesktop.org (Postfix) with ESMTP id 32F01A08D4
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 10 May 2012 03:14:03 -0700 (PDT)
In-Reply-To: <1334858104.32618.28.camel@atropine>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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 <ajax@redhat.com>, Takashi Iwai <tiwai@suse.de>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, 19 Apr 2012 13:55:04 -0400, Adam Jackson <ajax@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@kernel.org>
> > Signed-off-by: Takashi Iwai <tiwai@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@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre