Skip to content

Commit

Permalink
drm/i915: drop unnecessary check from fdi_link_train code
Browse files Browse the repository at this point in the history
They are all written for a specific north disaplay->pch combination.
So stop pretending otherwise.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Nov 11, 2012
1 parent 7fcb83c commit 8f5718a
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -2490,11 +2490,9 @@ static void ironlake_fdi_link_train(struct drm_crtc *crtc)
udelay(150);

/* Ironlake workaround, enable clock pointer after FDI enable*/
if (HAS_PCH_IBX(dev)) {
I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR);
I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR |
FDI_RX_PHASE_SYNC_POINTER_EN);
}
I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR);
I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR |
FDI_RX_PHASE_SYNC_POINTER_EN);

reg = FDI_RX_IIR(pipe);
for (tries = 0; tries < 5; tries++) {
Expand Down Expand Up @@ -2600,8 +2598,7 @@ static void gen6_fdi_link_train(struct drm_crtc *crtc)
POSTING_READ(reg);
udelay(150);

if (HAS_PCH_CPT(dev))
cpt_phase_pointer_enable(dev, pipe);
cpt_phase_pointer_enable(dev, pipe);

for (i = 0; i < 4; i++) {
reg = FDI_TX_CTL(pipe);
Expand Down Expand Up @@ -2735,8 +2732,7 @@ static void ivb_manual_fdi_link_train(struct drm_crtc *crtc)
POSTING_READ(reg);
udelay(150);

if (HAS_PCH_CPT(dev))
cpt_phase_pointer_enable(dev, pipe);
cpt_phase_pointer_enable(dev, pipe);

for (i = 0; i < 4; i++) {
reg = FDI_TX_CTL(pipe);
Expand Down

0 comments on commit 8f5718a

Please sign in to comment.