drm/i915: use the new dp train delay helpers
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 18 Oct 2012 08:15:30 +0000 (10:15 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 22 Oct 2012 20:34:46 +0000 (22:34 +0200)
Only really required for dp 1.2. I've hoped this would help with some
link training woes I'm fighting, but alas those are only dp 1.1
devices.

Also move a comment that went misplaced in the recent refactorings to
the right spot again.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_dp.c

index cd23ffadfda1cf44847d01faf62dcbff88c5087b..3cb180e38ca13bdc1cba6d0eec17dceda72c540d 100644 (file)
@@ -1821,13 +1821,13 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)
                DRM_DEBUG_KMS("training pattern 1 signal levels %08x\n",
                              signal_levels);
 
+               /* Set training pattern 1 */
                if (!intel_dp_set_link_train(intel_dp, DP,
                                             DP_TRAINING_PATTERN_1 |
                                             DP_LINK_SCRAMBLING_DISABLE))
                        break;
-               /* Set training pattern 1 */
 
-               udelay(100);
+               drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
                if (!intel_dp_get_link_status(intel_dp, link_status)) {
                        DRM_ERROR("failed to get link status\n");
                        break;
@@ -1910,7 +1910,7 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)
                                             DP_LINK_SCRAMBLING_DISABLE))
                        break;
 
-               udelay(400);
+               drm_dp_link_train_channel_eq_delay(intel_dp->dpcd);
                if (!intel_dp_get_link_status(intel_dp, link_status))
                        break;