Skip to content

Commit

Permalink
drm/i915: remove Haswell/LPT bits from ironlake_pch_enable
Browse files Browse the repository at this point in the history
Since now we have lpt_pch_enable for them.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Nov 11, 2012
1 parent 1507e5b commit 303b81e
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -3086,10 +3086,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
* enable sequence. */
intel_enable_pch_pll(intel_crtc);

if (HAS_PCH_LPT(dev)) {
DRM_DEBUG_KMS("LPT detected: programming iCLKIP\n");
lpt_program_iclkip(crtc);
} else if (HAS_PCH_CPT(dev)) {
if (HAS_PCH_CPT(dev)) {
u32 sel;

temp = I915_READ(PCH_DPLL_SEL);
Expand Down Expand Up @@ -3126,8 +3123,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
I915_WRITE(TRANS_VSYNC(pipe), I915_READ(VSYNC(pipe)));
I915_WRITE(TRANS_VSYNCSHIFT(pipe), I915_READ(VSYNCSHIFT(pipe)));

if (!IS_HASWELL(dev))
intel_fdi_normal_train(crtc);
intel_fdi_normal_train(crtc);

/* For PCH DP, enable TRANS_DP_CTL */
if (HAS_PCH_CPT(dev) &&
Expand Down

0 comments on commit 303b81e

Please sign in to comment.