---

yaml --- r: 329461 b: refs/heads/master c: 3b7a89f h: refs/heads/master i: 329459: fbb68d5 v: v3
git-mirror · Sep 17, 2012 · fa9646e · fa9646e
1 parent 601540c
commit fa9646e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c4c86f51c985a146ff7185abff102fc535f6fa8
+refs/heads/master: 3b7a89fce3e3dc96b549d6d829387b4439044d0d
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -527,7 +527,7 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val,
 	dev_priv->modeset_on_lid = 0;
 
 	mutex_lock(&dev->mode_config.mutex);
-	drm_helper_resume_force_mode(dev);
+	intel_modeset_check_state(dev);
 	mutex_unlock(&dev->mode_config.mutex);
 
 	return NOTIFY_OK;