Commit 349d7e5d authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: set the correct number of FDI lanes on Haswell

We had 2 places using X2 and one place using X1.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3107bd48
...@@ -171,7 +171,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) ...@@ -171,7 +171,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
I915_WRITE(DDI_BUF_CTL(PORT_E), I915_WRITE(DDI_BUF_CTL(PORT_E),
temp | temp |
DDI_BUF_CTL_ENABLE | DDI_BUF_CTL_ENABLE |
DDI_PORT_WIDTH_X2 | ((intel_crtc->fdi_lanes - 1) << 1) |
hsw_ddi_buf_ctl_values[i]); hsw_ddi_buf_ctl_values[i]);
udelay(600); udelay(600);
...@@ -193,7 +193,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc) ...@@ -193,7 +193,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
FDI_RX_ENABLE | FDI_RX_ENABLE |
FDI_LINK_TRAIN_PATTERN_1_CPT | FDI_LINK_TRAIN_PATTERN_1_CPT |
FDI_RX_ENHANCE_FRAME_ENABLE | FDI_RX_ENHANCE_FRAME_ENABLE |
FDI_PORT_WIDTH_2X_LPT | ((intel_crtc->fdi_lanes - 1) << 19) |
FDI_RX_PLL_ENABLE); FDI_RX_PLL_ENABLE);
POSTING_READ(reg); POSTING_READ(reg);
udelay(100); udelay(100);
...@@ -952,6 +952,7 @@ void intel_ddi_enable_pipe_func(struct drm_crtc *crtc) ...@@ -952,6 +952,7 @@ void intel_ddi_enable_pipe_func(struct drm_crtc *crtc)
} else if (type == INTEL_OUTPUT_ANALOG) { } else if (type == INTEL_OUTPUT_ANALOG) {
temp |= TRANS_DDI_MODE_SELECT_FDI; temp |= TRANS_DDI_MODE_SELECT_FDI;
temp |= (intel_crtc->fdi_lanes - 1) << 1;
} else if (type == INTEL_OUTPUT_DISPLAYPORT || } else if (type == INTEL_OUTPUT_DISPLAYPORT ||
type == INTEL_OUTPUT_EDP) { type == INTEL_OUTPUT_EDP) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment