From e4d92a8d15dd11e73e2350ddf78cd372e1a92d58 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun, 9 Sep 2012 19:58:56 +0200
Subject: [PATCH] --- yaml --- r: 329485 b: refs/heads/master c:
 b6f69c9a7f800c9f22cc94aa193f8451b3cc299c h: refs/heads/master i:   329483:
 3d670591b5e01b504d4c4477349608c473f2fa53 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/intel_dp.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c481373589f5..e1faca2e3bc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba7a64587bcff8d85666a70b0a515d5fbcaa000c
+refs/heads/master: b6f69c9a7f800c9f22cc94aa193f8451b3cc299c
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index a48c0260a9b0..a69d9a223162 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1921,13 +1921,6 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 
 	msleep(17);
 
-	if (is_edp(intel_dp)) {
-		if (HAS_PCH_CPT(dev) && (IS_GEN7(dev) || !is_cpu_edp(intel_dp)))
-			DP |= DP_LINK_TRAIN_OFF_CPT;
-		else
-			DP |= DP_LINK_TRAIN_OFF;
-	}
-
 	if (HAS_PCH_IBX(dev) &&
 	    I915_READ(intel_dp->output_reg) & DP_PIPEB_SELECT) {
 		struct drm_crtc *crtc = intel_dp->base.base.crtc;