From fa9646ee48189de71467decefda1714511b49fb8 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 17 Sep 2012 22:27:21 +0200
Subject: [PATCH] --- yaml --- r: 329461 b: refs/heads/master c:
 3b7a89fce3e3dc96b549d6d829387b4439044d0d h: refs/heads/master i:   329459:
 fbb68d56d025948a98d19a207539bfe07cdfc441 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i915/intel_lvds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 504793d828f1..f7c7fe52ee1e 100644
--- 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
index 564689554989..dc9f9ff34d8c 100644
--- 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;