Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269849
b: refs/heads/master
c: a487928
h: refs/heads/master
i:
  269847: 4c381df
v: v3
  • Loading branch information
Jesse Barnes authored and Keith Packard committed Oct 21, 2011
1 parent 7e9669d commit 1a6173a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c9c18c29347a8bfce1dcd28271bf782aab16639
refs/heads/master: a487928908226df493a3ce145ecf4bb39296714e
25 changes: 0 additions & 25 deletions trunk/drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -5620,31 +5620,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
}
}

/* enable transcoder DPLL */
if (HAS_PCH_CPT(dev)) {
u32 transc_sel = intel_crtc->use_pll_a ? TRANSC_DPLLA_SEL :
TRANSC_DPLLB_SEL;
temp = I915_READ(PCH_DPLL_SEL);
switch (pipe) {
case 0:
temp |= TRANSA_DPLL_ENABLE | TRANSA_DPLLA_SEL;
break;
case 1:
temp |= TRANSB_DPLL_ENABLE | TRANSB_DPLLB_SEL;
break;
case 2:
temp &= ~(TRANSC_DPLLB_SEL);
temp |= TRANSC_DPLL_ENABLE | transc_sel;
break;
default:
BUG();
}
I915_WRITE(PCH_DPLL_SEL, temp);

POSTING_READ(PCH_DPLL_SEL);
udelay(150);
}

/* The LVDS pin pair needs to be on before the DPLLs are enabled.
* This is an exception to the general rule that mode_set doesn't turn
* things on.
Expand Down

0 comments on commit 1a6173a

Please sign in to comment.