From 54e483ffbde7148c6374e053cc1c54d26c5ff416 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 26 Nov 2009 08:55:18 +1000
Subject: [PATCH] --- yaml --- r: 174639 b: refs/heads/master c:
 5fbfce7fc906c4a9e3d5e0872e5d6affaca54761 h: refs/heads/master i:   174637:
 c03f30f0852bcb8ce08bcf02638d980540163b2f   174635:
 f5e0247ace2db840321bb2353284f9af3c61b6c5   174631:
 22007ac6180f165674feba7adc16ff9b481906f0   174623:
 b98d46694e09effdc755f502c78e2c6a2792d5a8 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/radeon/atombios_dp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8ee215c2f6b..b551860b443f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d9cb47dd6a754e434e5adeccb3a1e2835594fd
+refs/heads/master: 5fbfce7fc906c4a9e3d5e0872e5d6affaca54761
diff --git a/trunk/drivers/gpu/drm/radeon/atombios_dp.c b/trunk/drivers/gpu/drm/radeon/atombios_dp.c
index 65c82395c8e0..28741d40bf66 100644
--- a/trunk/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/trunk/drivers/gpu/drm/radeon/atombios_dp.c
@@ -627,11 +627,12 @@ void dp_link_train(struct drm_encoder *encoder,
 
 	/* set initial vs/emph */
 	memset(train_set, 0, 4);
-	dp_update_dpvs_emph(radeon_connector, encoder, train_set);
 	udelay(400);
 	/* set training pattern 1 on the sink */
 	dp_set_training(radeon_connector, DP_TRAINING_PATTERN_1);
 
+	dp_update_dpvs_emph(radeon_connector, encoder, train_set);
+
 	/* clock recovery loop */
 	clock_recovery = false;
 	tries = 0;