---

yaml
---
r: 264319
b: refs/heads/master
c: 6777a4f
h: refs/heads/master
i:
  264317: daa295b
  264315: e8387ec
  264311: 4aa4f19
  264303: 3263fbe
  264287: 573274c
  264255: 4f6ad57
  264191: b06abea
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f332844cc87c5f99c5300f788abbe8a8c731390
+refs/heads/master: 6777a4f6898a53974ef7fe7ce09ec41fae0f32db

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);
 			}
 		}