Commit 20749730 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter

drm/i915: remove Haswell code from ironlake_fdi_pll_enable

This function is not called on Haswell anymore.
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c1f63f9d
...@@ -2787,18 +2787,14 @@ static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc) ...@@ -2787,18 +2787,14 @@ static void ironlake_fdi_pll_enable(struct intel_crtc *intel_crtc)
POSTING_READ(reg); POSTING_READ(reg);
udelay(200); udelay(200);
/* On Haswell, the PLL configuration for ports and pipes is handled /* Enable CPU FDI TX PLL, always on for Ironlake */
* separately, as part of DDI setup */ reg = FDI_TX_CTL(pipe);
if (!IS_HASWELL(dev)) { temp = I915_READ(reg);
/* Enable CPU FDI TX PLL, always on for Ironlake */ if ((temp & FDI_TX_PLL_ENABLE) == 0) {
reg = FDI_TX_CTL(pipe); I915_WRITE(reg, temp | FDI_TX_PLL_ENABLE);
temp = I915_READ(reg);
if ((temp & FDI_TX_PLL_ENABLE) == 0) {
I915_WRITE(reg, temp | FDI_TX_PLL_ENABLE);
POSTING_READ(reg); POSTING_READ(reg);
udelay(100); udelay(100);
}
} }
} }
......
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