From 3c7bc5131115de0eacf746afbef6d38ca8d004f8 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 13 Oct 2010 09:59:17 +0100
Subject: [PATCH] --- yaml --- r: 218311 b: refs/heads/master c:
 8b99e68c0a40bcf082c1ba9aaad83cca4def8cec h: refs/heads/master i:   218309:
 892cd9b85d02ba5a101e9e06076ea3702d130545   218307:
 fea37a43e8cc06ea9a3189ca4944a3b79d081eb9   218303:
 1a8a2be753151c1ada3fc8e20aa3bf425df592ba v: v3

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

diff --git a/[refs] b/[refs]
index 62014de9d0d7..560843ed3b39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 736085bcf91720fd90175c288c542c721c281bb0
+refs/heads/master: 8b99e68c0a40bcf082c1ba9aaad83cca4def8cec
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index faacbbdbb270..cda36b348fe8 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -345,8 +345,11 @@ intel_find_pll_ironlake_dp(const intel_limit_t *, struct drm_crtc *crtc,
 static inline u32 /* units of 100MHz */
 intel_fdi_link_freq(struct drm_device *dev)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	return (I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2;
+	if (IS_GEN5(dev)) {
+		struct drm_i915_private *dev_priv = dev->dev_private;
+		return (I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2;
+	} else
+		return 27;
 }
 
 static const intel_limit_t intel_limits_i8xx_dvo = {