From 12bbc1334494488a553fbc819212f158df756ae4 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 26 May 2013 18:56:26 +0200 Subject: [PATCH] drm/i915: fix up pch pll handling in ->mode_set We ->mode_set is called we can't just blindly reuse an existing pll since that might be shared with a different, still active pch output. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5fadcf7..2dc0abb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3056,9 +3056,9 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3 pll = intel_crtc->pch_pll; if (pll) { - DRM_DEBUG_KMS("CRTC:%d reusing existing PCH PLL %x\n", + DRM_DEBUG_KMS("CRTC:%d dropping existing PCH PLL %x\n", intel_crtc->base.base.id, pll->pll_reg); - goto prepare; + intel_put_pch_pll(intel_crtc); } if (HAS_PCH_IBX(dev_priv->dev)) { -- 1.7.11.7