From ef5c97f5340f91894b076d19c969d4bbcd069897 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 6 Sep 2012 22:08:33 +0200 Subject: [PATCH] --- yaml --- r: 329491 b: refs/heads/master c: 46b6f8149a7a631ae8789f4eaebf8c27c1279b5a h: refs/heads/master i: 329489: c68e79de76609b0c07d4b1a45ecf4d6b90b53a84 329487: ca8d1b8ce8d17c37cd86fa975a7579482f2ada16 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e0af8e5a672c..87c42ba45025 100644 --- 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 index b20fad3d9f04..5e42a03f2685 100644 --- 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)