[PATCH 74/81] drm/i915: don't disable fdi links harder in ilk_crtc_enable

Daniel Vetter
2012-07-11T15:36:51Z

Because they should have been disabled when shutting down the display
pipe previously. To ensure that this is the case, add a few assserts
instead of unconditionally disabling the fdi link.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 38a73bf..03133e4 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3179,10 +3179,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);
+ }

/* Enable panel fitting for LVDS */
if (dev_priv->pch_pf_size &&
--
1.7.7.6