From 469c4a221bff64130bec02b41a6c7a3892eba03f Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 20 May 2012 18:41:57 +0200 Subject: [PATCH] drm/i915: IBX has a fixed pch pll to pch pipe mapping This should fix breakage introduce in commit ee7b9f93fd96a72e5d09e2b44024c11880873c6b Author: Jesse Barnes Date: Fri Apr 20 17:11:53 2012 +0100 drm/i915: manage PCH PLLs separately from pipes Cc: Jesse Barnes Cc: Chris Wilson Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49712 Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f3d39f4..0d95f88 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2911,6 +2911,14 @@ static struct intel_pch_pll *intel_get_pch_pll(struct intel_crtc *intel_crtc, u3 goto prepare; } + if (HAS_PCH_IBX(dev_priv->dev)) { + /* Ironlake PCH has a fixed PLL->PCH pipe association. */ + i = intel_crtc->pipe; + pll = &dev_priv->pch_plls[i]; + + goto found; + } + for (i = 0; i < dev_priv->num_pch_pll; i++) { pll = &dev_priv->pch_plls[i]; -- 1.7.10