aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-10-13 13:08:34 -0400
committerKeith Packard <keithp@keithp.com>2011-10-21 02:21:58 -0400
commita487928908226df493a3ce145ecf4bb39296714e (patch)
tree8b967adcac68bff3383dbefab246ce7541f4b265 /drivers
parent4c9c18c29347a8bfce1dcd28271bf782aab16639 (diff)
drm/i915: remove transcoder PLL mashing from mode_set per specs
Belongs in PCH enable instead. The duplication is worrying and the specs explicitly list transcoder select *after* actual PLL enable, which doesn't occur until later. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Tested-By: Eugeni Dodonov <eugeni.dodonov@intel.com> Reviewed-By: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 921253cb4f85..981b1f1c04d8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5620,31 +5620,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
5620 } 5620 }
5621 } 5621 }
5622 5622
5623 /* enable transcoder DPLL */
5624 if (HAS_PCH_CPT(dev)) {
5625 u32 transc_sel = intel_crtc->use_pll_a ? TRANSC_DPLLA_SEL :
5626 TRANSC_DPLLB_SEL;
5627 temp = I915_READ(PCH_DPLL_SEL);
5628 switch (pipe) {
5629 case 0:
5630 temp |= TRANSA_DPLL_ENABLE | TRANSA_DPLLA_SEL;
5631 break;
5632 case 1:
5633 temp |= TRANSB_DPLL_ENABLE | TRANSB_DPLLB_SEL;
5634 break;
5635 case 2:
5636 temp &= ~(TRANSC_DPLLB_SEL);
5637 temp |= TRANSC_DPLL_ENABLE | transc_sel;
5638 break;
5639 default:
5640 BUG();
5641 }
5642 I915_WRITE(PCH_DPLL_SEL, temp);
5643
5644 POSTING_READ(PCH_DPLL_SEL);
5645 udelay(150);
5646 }
5647
5648 /* The LVDS pin pair needs to be on before the DPLLs are enabled. 5623 /* The LVDS pin pair needs to be on before the DPLLs are enabled.
5649 * This is an exception to the general rule that mode_set doesn't turn 5624 * This is an exception to the general rule that mode_set doesn't turn
5650 * things on. 5625 * things on.