From 748ca02f788897c826eb713e57f93d6ff2186d53 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 3 Oct 2011 08:37:33 -0400 Subject: [PATCH] --- yaml --- r: 264239 b: refs/heads/master c: 5ba7ddf81634bfdf32d09261d2959e3f5b7c4263 h: refs/heads/master i: 264237: 6db0e85847fe2e3ed7b0d102a8530e0bedf701b4 264235: b2ebab372ca5479b9f289f3d306daaf8fbc106a2 264231: c8f7f511ad890e2259ff8e9a82c731436ea63184 264223: edbdc5a43a3e7c5d93e96ef0d13c7b791dc076c5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_connectors.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index db9b16882b70..e7810c3ef8ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6375bda073724ead7df08746866b724b1799a295 +refs/heads/master: 5ba7ddf81634bfdf32d09261d2959e3f5b7c4263 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c index c4b8741dbf58..bce63fd329d4 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c @@ -68,11 +68,11 @@ void radeon_connector_hotplug(struct drm_connector *connector) if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { int saved_dpms = connector->dpms; - if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) && - radeon_dp_needs_link_train(radeon_connector)) - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); - else + /* Only turn off the display it it's physically disconnected */ + if (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); + else if (radeon_dp_needs_link_train(radeon_connector)) + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); connector->dpms = saved_dpms; } }