From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adam Jackson <ajax@redhat.com>
Subject: Re: [PATCH] drm/i915: Suppress hotplug work during PM
 suspend/resume
Date: Thu, 19 Apr 2012 13:55:04 -0400
Message-ID: <1334858104.32618.28.camel@atropine>
References: <s5hlilr4s9h.wl%tiwai@suse.de>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0654578874=="
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
	by gabe.freedesktop.org (Postfix) with ESMTP id CCDA59E75A
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 19 Apr 2012 10:55:06 -0700 (PDT)
In-Reply-To: <s5hlilr4s9h.wl%tiwai@suse.de>
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: Takashi Iwai <tiwai@suse.de>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org


--===============0654578874==
Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature";
	boundary="=-vksJFdE2Nsbxrs5RVa4a"


--=-vksJFdE2Nsbxrs5RVa4a
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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.
>=20
> 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_dr=
v.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);
=20
                drm_mode_config_reset(dev);
-               drm_irq_install(dev);
=20
                /* Resume the modeset for every activated CRTC */
                drm_helper_resume_force_mode(dev);
=20
+               drm_irq_install(dev);
+
                if (IS_IRONLAKE_M(dev))
                        ironlake_enable_rc6(dev);

- ajax

--=-vksJFdE2Nsbxrs5RVa4a
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk+QUXkACgkQW4otUKDs0NMFOQCghYTQXFO4t3VdAjlFHO3TXK32
0I4AmgJ/b4uWKNvTBNJSNcmogVMhWp3h
=ZwwN
-----END PGP SIGNATURE-----

--=-vksJFdE2Nsbxrs5RVa4a--


--===============0654578874==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--===============0654578874==--