From 4e98aeb1c916091639917fe17ef68fce829319c0 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 4 Oct 2011 12:23:24 -0400 Subject: [PATCH] --- yaml --- r: 264319 b: refs/heads/master c: 6777a4f6898a53974ef7fe7ce09ec41fae0f32db h: refs/heads/master i: 264317: daa295b8ebe73dd54be2dd97767ac542295225a9 264315: e8387ec3d789aa6b53df3ee0989babe2bb899f03 264311: 4aa4f195f78b9d459ddf6ce25ec6a5360cd79b0f 264303: 3263fbe44a4d173e5e088d9403b5397b9fe61a4a 264287: 573274c911bde7bc18db286ae76ecabbf6cf4022 264255: 4f6ad5763a8159c51fbebfe39f85a7d66ef23cce 264191: b06abeac2fa90f9f53360782482ff97009c3ba8d v: v3 --- [refs] | 2 +- .../gpu/drm/radeon/radeon_connectors.c | 21 ++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f0ada587a3df..e61918ba320c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f332844cc87c5f99c5300f788abbe8a8c731390 +refs/heads/master: 6777a4f6898a53974ef7fe7ce09ec41fae0f32db diff --git a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c index bce63fd329d4..449c3d8c6836 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1303,23 +1303,14 @@ radeon_dp_detect(struct drm_connector *connector, bool force) /* get the DPCD from the bridge */ radeon_dp_getdpcd(radeon_connector); - if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) - ret = connector_status_connected; - else { - /* need to setup ddc on the bridge */ - if (encoder) - radeon_atom_ext_encoder_setup_ddc(encoder); + if (encoder) { + /* setup ddc on the bridge */ + radeon_atom_ext_encoder_setup_ddc(encoder); if (radeon_ddc_probe(radeon_connector, - radeon_connector->requires_extended_probe)) + radeon_connector->requires_extended_probe)) /* try DDC */ ret = connector_status_connected; - } - - if ((ret == connector_status_disconnected) && - radeon_connector->dac_load_detect) { - struct drm_encoder *encoder = radeon_best_single_encoder(connector); - struct drm_encoder_helper_funcs *encoder_funcs; - if (encoder) { - encoder_funcs = encoder->helper_private; + else if (radeon_connector->dac_load_detect) { /* try load detection */ + struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; ret = encoder_funcs->detect(encoder, connector); } }