Re: [PATCH] drm/i915: Suppress hotplug work during PM suspend/resume

Adam Jackson
2012-04-19T17:55:06Z

[-- 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