From bdfed9c1a4f597512ff815f15cd1ffcf76648471 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu, 10 Sep 2009 15:28:04 -0700
Subject: [PATCH] --- yaml --- r: 165991 b: refs/heads/master c:
 b42d4c5c6a872815d711e5d51a600f5122c38eee h: refs/heads/master i:   165989:
 14cda926a97eb7611725dbf73034299218d711c3   165987:
 faceb020e7f4f2338c343422799ff80b7d6eae57   165983:
 0c575d892d84b5e2f10d7cba57fc1033de655a00 v: v3

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

diff --git a/[refs] b/[refs]
index 5d0510a7973b..a10a7a6c5ebd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1c7af60892070e4b82ad63bbfb95ae745056de0
+refs/heads/master: b42d4c5c6a872815d711e5d51a600f5122c38eee
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
index e190ff792bf0..90f69d4717e9 100644
--- a/trunk/drivers/gpu/drm/i915/intel_lvds.c
+++ b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -589,12 +589,18 @@ static void intel_lvds_mode_set(struct drm_encoder *encoder,
 /**
  * Detect the LVDS connection.
  *
- * This always returns CONNECTOR_STATUS_CONNECTED.  This connector should only have
- * been set up if the LVDS was actually connected anyway.
+ * Since LVDS doesn't have hotlug, we use the lid as a proxy.  Open means
+ * connected and closed means disconnected.  We also send hotplug events as
+ * needed, using lid status notification from the input layer.
  */
 static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
 {
-	return connector_status_connected;
+	enum drm_connector_status status = connector_status_connected;
+
+	if (!acpi_lid_open())
+		status = connector_status_disconnected;
+
+	return status;
 }
 
 /**