1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index bce63fd329d4..449c3d8c6836 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/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);
                         }
                 }