---

yaml --- r: 345197 b: refs/heads/master c: fff367c h: refs/heads/master i: 345195: 695fbfb v: v3
git-mirror · Nov 11, 2012 · a90879b · a90879b
1 parent 09a08aa
commit a90879b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd986abbac6044c76b95fd512bc62329ef9959d0
+refs/heads/master: fff367c752f5fb998882c7bc0a213ab1e53857db
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3227,6 +3227,9 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	is_pch_port = ironlake_crtc_driving_pch(crtc);
 
 	if (is_pch_port) {
+		/* Note: FDI PLL enabling _must_ be done before we enable the
+		 * cpu pipes, hence this is separate from all the other fdi/pch
+		 * enabling. */
 		ironlake_fdi_pll_enable(intel_crtc);
 	} else {
 		assert_fdi_tx_disabled(dev_priv, pipe);