drm/nouveau: report unknown connector state if lid closed
Ben Skeggs [Thu, 25 Feb 2010 02:12:09 +0000 (12:12 +1000)]
This is in preference to disconnected.  If there's no other outputs
connected this will cause LVDS to be programmed even with the lid
closed rather than having X fail to start because of no available
outputs.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nouveau_connector.c

index dee52c8..24327f4 100644 (file)
@@ -239,12 +239,14 @@ nouveau_connector_detect(struct drm_connector *connector)
        if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS)
                nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
        if (nv_encoder && nv_connector->native_mode) {
+               unsigned status = connector_status_connected;
+
 #ifdef CONFIG_ACPI
                if (!nouveau_ignorelid && !acpi_lid_open())
-                       return connector_status_disconnected;
+                       status = connector_status_unknown;
 #endif
                nouveau_connector_set_encoder(connector, nv_encoder);
-               return connector_status_connected;
+               return status;
        }
 
        /* Cleanup the previous EDID block. */