aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-26 04:58:13 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-11-11 17:50:57 -0500
commitd74cf324e2b64349a49d0f17e9f6764f8a7d8349 (patch)
tree8fba7fd2b0d72d98629b6f1f2421f31b7f22a0a3 /drivers/gpu/drm/i915/intel_display.c
parentfff367c752f5fb998882c7bc0a213ab1e53857db (diff)
drm/i915: set FDI_RX_MISC to recommended values on CPT/PPT
My machine here has the correct ones already, but better safe than sorry. IBX has different settings for that register, and on IBX the device defaults match the recommended values. Hence I did not add the respective writes for IBX. LPT needs the same settings, but that has been done already commit 4acf518626cdad5bbf7aac9869bd4accbbfb4ad3 Author: Eugeni Dodonov <eugeni.dodonov@intel.com> Date: Wed Jul 4 20:15:16 2012 -0300 drm/i915: program FDI_RX TP and FDI delays Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 612b4105b758..a3e715b4290d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2479,6 +2479,9 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
2479 temp |= FDI_LINK_TRAIN_400MV_0DB_SNB_B; 2479 temp |= FDI_LINK_TRAIN_400MV_0DB_SNB_B;
2480 I915_WRITE(reg, temp | FDI_TX_ENABLE); 2480 I915_WRITE(reg, temp | FDI_TX_ENABLE);
2481 2481
2482 I915_WRITE(FDI_RX_MISC(pipe),
2483 FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
2484
2482 reg = FDI_RX_CTL(pipe); 2485 reg = FDI_RX_CTL(pipe);
2483 temp = I915_READ(reg); 2486 temp = I915_READ(reg);
2484 if (HAS_PCH_CPT(dev)) { 2487 if (HAS_PCH_CPT(dev)) {
@@ -2611,6 +2614,9 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
2611 temp |= FDI_COMPOSITE_SYNC; 2614 temp |= FDI_COMPOSITE_SYNC;
2612 I915_WRITE(reg, temp | FDI_TX_ENABLE); 2615 I915_WRITE(reg, temp | FDI_TX_ENABLE);
2613 2616
2617 I915_WRITE(FDI_RX_MISC(pipe),
2618 FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
2619
2614 reg = FDI_RX_CTL(pipe); 2620 reg = FDI_RX_CTL(pipe);
2615 temp = I915_READ(reg); 2621 temp = I915_READ(reg);
2616 temp &= ~FDI_LINK_TRAIN_AUTO; 2622 temp &= ~FDI_LINK_TRAIN_AUTO;