From 988fc70b484903f9a28187935654dfa175f3cc6b Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 30 May 2012 12:31:56 +0200
Subject: [PATCH] --- yaml --- r: 318543 b: refs/heads/master c:
 493a708179469e3978e50f59902e9d47b6f3dabd h: refs/heads/master i:   318541:
 dc6dfbf2bbb2138d31d83a5f8e124506ba65714a   318539:
 e69a0493a4b1da5e2bec785f651a905c8756aabe   318535:
 e33dd1d04046f4068d83c40a917dd141a838edc1   318527:
 039459af3a1566fc4ffdd141c4c29be1ebaf8c0a v: v3

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

diff --git a/[refs] b/[refs]
index 5a7d4bd9428d..6a0c91be346d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e269f90f3d3f7c70cf661c660bf445597261f54a
+refs/heads/master: 493a708179469e3978e50f59902e9d47b6f3dabd
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index c71e7890e6f6..ade98e0bca84 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1914,7 +1914,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 			DP |= DP_LINK_TRAIN_OFF;
 	}
 
-	if (!HAS_PCH_CPT(dev) &&
+	if (HAS_PCH_IBX(dev) &&
 	    I915_READ(intel_dp->output_reg) & DP_PIPEB_SELECT) {
 		struct drm_crtc *crtc = intel_dp->base.base.crtc;