public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Adam Jackson <ajax@redhat.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Suppress hotplug work during PM suspend/resume
Date: Thu, 19 Apr 2012 13:55:04 -0400	[thread overview]
Message-ID: <1334858104.32618.28.camel@atropine> (raw)
In-Reply-To: <s5hlilr4s9h.wl%tiwai@suse.de>


[-- Attachment #1.1: Type: text/plain, Size: 943 bytes --]

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);

- ajax

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2012-04-19 17:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-19 16:10 [PATCH] drm/i915: Suppress hotplug work during PM suspend/resume Takashi Iwai
2012-04-19 16:22 ` Chris Wilson
2012-04-19 16:32   ` Takashi Iwai
2012-04-19 16:29 ` Daniel Vetter
2012-04-19 16:38   ` Takashi Iwai
2012-04-19 16:52     ` Daniel Vetter
2012-04-19 17:55 ` Adam Jackson [this message]
2012-04-19 18:11   ` Takashi Iwai
2012-04-25  8:14     ` Takashi Iwai
2012-05-10  6:34       ` Takashi Iwai
2012-05-10  8:29         ` Daniel Vetter
2012-05-10  8:40           ` Takashi Iwai
2012-05-10  9:06             ` Daniel Vetter
2012-05-10  9:19               ` Takashi Iwai
2012-05-10  9:25                 ` Chris Wilson
2012-05-10  9:39                   ` Takashi Iwai
2012-05-10 10:04                     ` Daniel Vetter
2012-05-10 10:12                     ` Chris Wilson
2012-05-10 10:13   ` Chris Wilson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334858104.32618.28.camel@atropine \
    --to=ajax@redhat.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox