diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 02:12:09 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-25 05:09:44 (GMT) |
| commit | b30083bdb990bcc2829fce83d871a86059ff4fc1 (patch) | |
| tree | 44d6f2d48e11a31a51cadad4305b4d4666a0a440 /drivers/gpu/drm/nouveau | |
| parent | c52e53fd38b195169c67a8cc9ed1af0125d2655c (diff) | |
| download | linux-b30083bdb990bcc2829fce83d871a86059ff4fc1.tar.xz | |
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
outputs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index dee52c8..24327f4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -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. */ |