1 files changed, 18 insertions, 23 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 74d2efaec52f..96501ff0e55b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -69,25 +69,18 @@ void amdgpu_connector_hotplug(struct drm_connector *connector)
                 /* don't do anything if sink is not display port, i.e.,
                  * passive dp->(dvi|hdmi) adaptor
                  */
-                if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) {
-                        int saved_dpms = connector->dpms;
-                        /* Only turn off the display if it's physically disconnected */
-                        if (!amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd)) {
-                                drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
-                        } else if (amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) {
-                                /* Don't try to start link training before we
-                                 * have the dpcd */
-                                if (amdgpu_atombios_dp_get_dpcd(amdgpu_connector))
-                                        return;
-
-                                /* set it to OFF so that drm_helper_connector_dpms()
-                                 * won't return immediately since the current state
-                                 * is ON at this point.
-                                 */
-                                connector->dpms = DRM_MODE_DPMS_OFF;
-                                drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
-                        }
-                        connector->dpms = saved_dpms;
+                if (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT &&
+                    amdgpu_display_hpd_sense(adev, amdgpu_connector->hpd.hpd) &&
+                    amdgpu_atombios_dp_needs_link_train(amdgpu_connector)) {
+                        /* Don't start link training before we have the DPCD */
+                        if (amdgpu_atombios_dp_get_dpcd(amdgpu_connector))
+                                return;
+
+                        /* Turn the connector off and back on immediately, which
+                         * will trigger link training
+                         */
+                        drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
+                        drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
                 }
         }
 }
@@ -885,7 +878,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)
                 ret = connector_status_disconnected;
 
         if (amdgpu_connector->ddc_bus)
-                dret = amdgpu_ddc_probe(amdgpu_connector, false);
+                dret = amdgpu_display_ddc_probe(amdgpu_connector, false);
         if (dret) {
                 amdgpu_connector->detected_by_load = false;
                 amdgpu_connector_free_edid(connector);
@@ -1010,7 +1003,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)
         }
 
         if (amdgpu_connector->ddc_bus)
-                dret = amdgpu_ddc_probe(amdgpu_connector, false);
+                dret = amdgpu_display_ddc_probe(amdgpu_connector, false);
         if (dret) {
                 amdgpu_connector->detected_by_load = false;
                 amdgpu_connector_free_edid(connector);
@@ -1417,7 +1410,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
                         /* setup ddc on the bridge */
                         amdgpu_atombios_encoder_setup_ext_encoder_ddc(encoder);
                         /* bridge chips are always aux */
-                        if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */
+                        /* try DDC */
+                        if (amdgpu_display_ddc_probe(amdgpu_connector, true))
                                 ret = connector_status_connected;
                         else if (amdgpu_connector->dac_load_detect) { /* try load detection */
                                 const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
@@ -1437,7 +1431,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
                                         ret = connector_status_connected;
                         } else {
                                 /* try non-aux ddc (DP to DVI/HDMI/etc. adapter) */
-                                if (amdgpu_ddc_probe(amdgpu_connector, false))
+                                if (amdgpu_display_ddc_probe(amdgpu_connector,
+                                                             false))
                                         ret = connector_status_connected;
                         }
                 }