drm/i915: cleanup lvds detection function

Commit Message

Jesse Barnes July 9, 2010, 5:47 p.m. UTC

This function and its description were confusing at best.  Clean them up to
reflect the current state of things.

Signed-off-by: Jesse Barnes <[e-mail]>

Patch

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 0eab8df..6bc313a 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -542,22 +542,14 @@  static void intel_lvds_mode_set(struct drm_encoder *encoder,
 /**
  * Detect the LVDS connection.
  *
- * 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.
+ * Note: it would be nice to use lid state as a proxy here, but actual state is
+ * not widely available (either it doesn't exist or is broken on many platforms)
+ * so just return connector_status_connected at all times, since this function
+ * is only called if an LVDS display is detected at init time.
  */
 static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
 {
-	struct drm_device *dev = connector->dev;
-	enum drm_connector_status status = connector_status_connected;
-
-	/* ACPI lid methods were generally unreliable in this generation, so
-	 * don't even bother.
-	 */
-	if (IS_GEN2(dev) || IS_GEN3(dev))
-		return connector_status_connected;
-
-	return status;
+	return connector_status_connected;
 }
 
 /**