External display

Commit Message

Chris Wilson Jan. 14, 2011, 12:51 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/intel_lvds.c
b/drivers/gpu/drm/i915/intel_lvds
index 9795eb5..45b1fe4 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -474,11 +474,9 @@  intel_lvds_detect(struct drm_connector *connector, bool for
        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;
+       /* ACPI lid methods were generally unreliable, so don't even bother. */
+       if (INTEL_INFO(dev)->gen >= 5 && !acpi_lid_open())
+               status = connector_status_disconnected;
 
        return status;
 }