Commit b30083bd authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: report unknown connector state if lid closed

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

Signed-off-by: default avatarBen Skeggs <>
parent c52e53fd
...@@ -239,12 +239,14 @@ nouveau_connector_detect(struct drm_connector *connector) ...@@ -239,12 +239,14 @@ nouveau_connector_detect(struct drm_connector *connector)
if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS) if (nv_connector->dcb->type == DCB_CONNECTOR_LVDS)
nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS); nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS);
if (nv_encoder && nv_connector->native_mode) { if (nv_encoder && nv_connector->native_mode) {
unsigned status = connector_status_connected;
if (!nouveau_ignorelid && !acpi_lid_open()) if (!nouveau_ignorelid && !acpi_lid_open())
return connector_status_disconnected; status = connector_status_unknown;
#endif #endif
nouveau_connector_set_encoder(connector, nv_encoder); nouveau_connector_set_encoder(connector, nv_encoder);
return connector_status_connected; return status;
} }
/* Cleanup the previous EDID block. */ /* Cleanup the previous EDID block. */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment