From 28cd624713b1ee5ac2fffe814c1714925f97c86b Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 27 Oct 2012 18:46:14 +0200
Subject: [PATCH] --- yaml --- r: 345199 b: refs/heads/master c:
 572deb3728c1ad937d472b418588959344d884b4 h: refs/heads/master i:   345197:
 a90879b9eac32b7c6a2a96de86ed01b5001d8bbb   345195:
 695fbfb8f7a2a67f803e1428cf3f614553276e85   345191:
 04e867c6d41cd98ad3aecd3b2cb59abcfda24f11   345183:
 c46dbfdbbe57c09ee6e6d3f2f58b34775b92a90b v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b27a893ea89e..9f46dac35b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d74cf324e2b64349a49d0f17e9f6764f8a7d8349
+refs/heads/master: 572deb3728c1ad937d472b418588959344d884b4
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index a3e715b4290d..8216cfb57be4 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3014,6 +3014,13 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
 	/* For PCH output, training FDI link */
 	dev_priv->display.fdi_link_train(crtc);
 
+	/* XXX: pch pll's can be enabled any time before we enable the PCH
+	 * transcoder, and we actually should do this to not upset any PCH
+	 * transcoder that already use the clock when we share it.
+	 *
+	 * Note that enable_pch_pll tries to do the right thing, but get_pch_pll
+	 * unconditionally resets the pll - we need that to have the right LVDS
+	 * enable sequence. */
 	intel_enable_pch_pll(intel_crtc);
 
 	if (HAS_PCH_LPT(dev)) {