From ff49c217f188c4e3f44bb9a6191708b92057a293 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 29 Aug 2012 22:58:07 +0200
Subject: [PATCH] --- yaml --- r: 329455 b: refs/heads/master c:
 9dc10f37e326d5d789929e1886b5a8089ccee5a7 h: refs/heads/master i:   329453:
 72b0a2abdb97b9713578b51ed33dc570eaae40af   329451:
 52a59fe8ac2af6649d97912cc24a0989ad22620f   329447:
 62457bcb1446378c8c84dbf0c13792064452c220   329439:
 3299ffa69d612425c9cfae83dbffbf14184f1d42 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 303fc0d15472..42b90171beb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a261b246ebd552fd5d5a8ed84cc931bb821c427f
+refs/heads/master: 9dc10f37e326d5d789929e1886b5a8089ccee5a7
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index fe7512ae3945..cd6697c98c5a 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -549,11 +549,6 @@ static int i915_drm_thaw(struct drm_device *dev)
 		intel_modeset_setup_hw_state(dev);
 		drm_mode_config_reset(dev);
 		drm_irq_install(dev);
-
-		/* Resume the modeset for every activated CRTC */
-		mutex_lock(&dev->mode_config.mutex);
-		drm_helper_resume_force_mode(dev);
-		mutex_unlock(&dev->mode_config.mutex);
 	}
 
 	intel_opregion_init(dev);