drm/radeon: on hotplug force link training to happen (v2)
authorJerome Glisse <jglisse@redhat.com>
Thu, 19 Jul 2012 21:25:55 +0000 (17:25 -0400)
committerDave Airlie <airlied@redhat.com>
Wed, 25 Jul 2012 04:14:12 +0000 (14:14 +1000)
To have DP behave like VGA/DVI we need to retrain the link
on hotplug. For this to happen we need to force link
training to happen by setting connector dpms to off
before asking it turning it on again.

v2: agd5f
- drop the dp_get_link_status() change in atombios_dp.c
  for now.  We still need the dpms OFF change.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_connectors.c

index 3524f17e3f051d2e4e8ea32e81b121e7d52d8ce1..895e628b60f8a6ad2fd7cbac1358fc24f1b38075 100644 (file)
@@ -79,10 +79,16 @@ void radeon_connector_hotplug(struct drm_connector *connector)
                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 (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd))
+                       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))
+                       } else if (radeon_dp_needs_link_train(radeon_connector)) {
+                               /* 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;
                }
        }