redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau: report unknown connector state if lid closed

Browse source 
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>
This commit is contained in:
Ben Skeggs 2010-02-25 12:12:09 +10:00
parent c52e53fd38
commit b30083bdb9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nouveau_connector.c
View 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. */