Commit 7a419866 authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard

drm/i915: don't disable a PCH DPLL that's in use

If a PCH pipe PLL is being used by transcoder C, don't disable it.
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent e6bfaf85
...@@ -1204,7 +1204,8 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv, ...@@ -1204,7 +1204,8 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv,
enum pipe pipe) enum pipe pipe)
{ {
int reg; int reg;
u32 val; u32 val, pll_mask = TRANSC_DPLL_ENABLE | TRANSC_DPLLB_SEL,
pll_sel = TRANSC_DPLL_ENABLE;
if (pipe > 1) if (pipe > 1)
return; return;
...@@ -1215,6 +1216,15 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv, ...@@ -1215,6 +1216,15 @@ static void intel_disable_pch_pll(struct drm_i915_private *dev_priv,
/* Make sure transcoder isn't still depending on us */ /* Make sure transcoder isn't still depending on us */
assert_transcoder_disabled(dev_priv, pipe); assert_transcoder_disabled(dev_priv, pipe);
if (pipe == 0)
pll_sel |= TRANSC_DPLLA_SEL;
else if (pipe == 1)
pll_sel |= TRANSC_DPLLB_SEL;
if ((I915_READ(PCH_DPLL_SEL) & pll_mask) == pll_sel)
return;
reg = PCH_DPLL(pipe); reg = PCH_DPLL(pipe);
val = I915_READ(reg); val = I915_READ(reg);
val &= ~DPLL_VCO_ENABLE; val &= ~DPLL_VCO_ENABLE;
......
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