---

yaml --- r: 307459 b: refs/heads/master c: 6f13b7b h: refs/heads/master i: 307457: 68385a5 307455: a04b7ef v: v3
git-mirror · May 19, 2012 · 5e6c437 · 5e6c437
1 parent 868a0c8
commit 5e6c437
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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: