From 5e6c4375cf74ef864f64a14895cf5ab119ca75ce Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 13 May 2012 09:54:09 +0100
Subject: [PATCH] --- yaml --- r: 307459 b: refs/heads/master c:
 6f13b7b5be500178d5541b69ab911af2a77ec488 h: refs/heads/master i:   307457:
 68385a54f7fbf8259cfd074bdc27fcc1079a2955   307455:
 a04b7ef5d79a7caee997218753b197a217654c50 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a8d6ce9f24c7..6cd4b3a120ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48da64a8bf2e00952fcd3ad108babae5e003a03d
+refs/heads/master: 6f13b7b5be500178d5541b69ab911af2a77ec488
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 9dc42bf557be..f3d39f4f6909 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -2796,14 +2796,14 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
 	/* For PCH output, training FDI link */
 	dev_priv->display.fdi_link_train(crtc);
 
+	intel_enable_pch_pll(intel_crtc);
+
 	if (HAS_PCH_LPT(dev)) {
 		DRM_DEBUG_KMS("LPT detected: programming iCLKIP\n");
 		lpt_program_iclkip(crtc);
 	} else if (HAS_PCH_CPT(dev)) {
 		u32 sel;
 
-		intel_enable_pch_pll(intel_crtc);
-
 		temp = I915_READ(PCH_DPLL_SEL);
 		switch (pipe) {
 		default: