diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-02-24 21:12:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 19:01:52 -0400 |
| commit | 8209107cefb38f24571da7e806422709bd5e47af (patch) | |
| tree | e46dda459714f232682fea3d3b06e27ef5edb039 | |
| parent | 67c538878517bc45d1ac523fde97c8b12e180754 (diff) | |
drm/nouveau: report unknown connector state if lid closed
commit b30083bdb990bcc2829fce83d871a86059ff4fc1 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 d2f63353ea97..a378bc3cd7dd 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) | |||
| 239 | if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) | 239 | if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) |
| 240 | nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS); | 240 | nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS); |
| 241 | if (nv_encoder && nv_connector->native_mode) { | 241 | if (nv_encoder && nv_connector->native_mode) { |
| 242 | unsigned status = connector_status_connected; | ||
| 243 | |||
| 242 | #ifdef CONFIG_ACPI | 244 | #ifdef CONFIG_ACPI |
| 243 | if (!nouveau_ignorelid && !acpi_lid_open()) | 245 | if (!nouveau_ignorelid && !acpi_lid_open()) |
| 244 | return connector_status_disconnected; | 246 | status = connector_status_unknown; |
| 245 | #endif | 247 | #endif |
| 246 | nouveau_connector_set_encoder(connector, nv_encoder); | 248 | nouveau_connector_set_encoder(connector, nv_encoder); |
| 247 | return connector_status_connected; | 249 | return status; |
| 248 | } | 250 | } |
| 249 | 251 | ||
| 250 | /* Cleanup the previous EDID block. */ | 252 | /* Cleanup the previous EDID block. */ |