---

yaml --- r: 329491 b: refs/heads/master c: 46b6f81 h: refs/heads/master i: 329489: c68e79d 329487: ca8d1b8 v: v3
git-mirror · Sep 20, 2012 · ef5c97f · ef5c97f
1 parent 907e1d6
commit ef5c97f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a14d33592061032be0f8373627eb13882c857742
+refs/heads/master: 46b6f8149a7a631ae8789f4eaebf8c27c1279b5a
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3184,10 +3184,12 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 
 	is_pch_port = intel_crtc_driving_pch(crtc);
 
-	if (is_pch_port)
+	if (is_pch_port) {
 		ironlake_fdi_pll_enable(intel_crtc);
-	else
-		ironlake_fdi_disable(crtc);
+	} else {
+		assert_fdi_tx_disabled(dev_priv, pipe);
+		assert_fdi_rx_disabled(dev_priv, pipe);
+	}
 
 	for_each_encoder_on_crtc(dev, crtc, encoder)
 		if (encoder->pre_enable)