summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter2012-10-18 10:15:30 +0200
committerDaniel Vetter2012-10-22 22:34:46 +0200
commita7c9655fdd89fae1749c2e5beadae8b7d32093af (patch)
treedccee30e7ebff4dcfca1c243875ff2125103bda5
parentdrm: extract dp link train delay functions from radeon (diff)
downloadkernel-qcow2-linux-a7c9655fdd89fae1749c2e5beadae8b7d32093af.tar.gz
kernel-qcow2-linux-a7c9655fdd89fae1749c2e5beadae8b7d32093af.tar.xz
kernel-qcow2-linux-a7c9655fdd89fae1749c2e5beadae8b7d32093af.zip
drm/i915: use the new dp train delay helpers
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>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index cd23ffadfda1..3cb180e38ca1 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -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;