From 84b72077cdfcd03f2da52e85087138373e275d60 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 21 Jul 2010 13:57:47 -0700
Subject: [PATCH] --- yaml --- r: 205153 b: refs/heads/master c:
 4f444071702bf0b76cfb381150cf0fc8cacdc931 h: refs/heads/master i:   205151:
 bce350a4d04b4d4fd7862c2ce3ef17efdce97e03 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 804acb1ed44d..a2f63a91e649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 831cd4453598b2c8e193f077023910c6b0c39558
+refs/heads/master: 4f444071702bf0b76cfb381150cf0fc8cacdc931
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index c612981e6195..5a11a2bada37 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -534,7 +534,7 @@ intel_dp_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
 		}
 	}
 
-	if (IS_eDP(intel_encoder)) {
+	if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
 		/* okay we failed just pick the highest */
 		dp_priv->lane_count = max_lane_count;
 		dp_priv->link_bw = bws[max_clock];