---

yaml --- r: 329455 b: refs/heads/master c: 9dc10f3 h: refs/heads/master i: 329453: 72b0a2a 329451: 52a59fe 329447: 62457bc 329439: 3299ffa v: v3
git-mirror · Sep 6, 2012 · ff49c21 · ff49c21
1 parent 6aeab4b
commit ff49c21
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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);