---

yaml --- r: 329485 b: refs/heads/master c: b6f69c9 h: refs/heads/master i: 329483: 3d67059 v: v3
git-mirror · Sep 20, 2012 · e4d92a8 · e4d92a8
1 parent eafc38e
commit e4d92a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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;