diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-13 04:59:17 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 04:16:52 -0400 |
commit | 8b99e68c0a40bcf082c1ba9aaad83cca4def8cec (patch) | |
tree | a4f39bd07c900cc7202e78f8fe9fd628c9215396 /drivers/gpu/drm | |
parent | 736085bcf91720fd90175c288c542c721c281bb0 (diff) |
drm/i915: restore fixed FDI link rate on Sandybridge
FDI_PLL_BIOS_0 register is for Ironlake only, don't apply to
Sandybridge.
Original-patch-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index faacbbdbb270..cda36b348fe8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -345,8 +345,11 @@ intel_find_pll_ironlake_dp(const intel_limit_t *, struct drm_crtc *crtc, | |||
345 | static inline u32 /* units of 100MHz */ | 345 | static inline u32 /* units of 100MHz */ |
346 | intel_fdi_link_freq(struct drm_device *dev) | 346 | intel_fdi_link_freq(struct drm_device *dev) |
347 | { | 347 | { |
348 | struct drm_i915_private *dev_priv = dev->dev_private; | 348 | if (IS_GEN5(dev)) { |
349 | return (I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2; | 349 | struct drm_i915_private *dev_priv = dev->dev_private; |
350 | return (I915_READ(FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK) + 2; | ||
351 | } else | ||
352 | return 27; | ||
350 | } | 353 | } |
351 | 354 | ||
352 | static const intel_limit_t intel_limits_i8xx_dvo = { | 355 | static const intel_limit_t intel_limits_i8xx_dvo = { |