drm/i915: don't assert disabled FDI before disabling the FDI

On Haswell/LPT we must disable the PCH transcoder before we disable
the FDI, so don't check for disabled FDI there.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d50c3ff60bdd84311d0328738a2ba2aa9e64d3e4..6d48c73b5cf3b1744a3a7058cf198d03e90dc6f6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1770,15 +1770,10 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv,
                DRM_ERROR("failed to disable transcoder %d\n", pipe);
 }
 
-static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv,
-                                      enum transcoder cpu_transcoder)
+static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv)
 {
        u32 val;
 
-       /* FDI relies on the transcoder */
-       assert_fdi_tx_disabled(dev_priv, cpu_transcoder);
-       assert_fdi_rx_disabled(dev_priv, TRANSCODER_A);
-
        val = I915_READ(_TRANSACONF);
        val &= ~TRANS_ENABLE;
        I915_WRITE(_TRANSACONF, val);
@@ -3638,7 +3633,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
 
        if (is_pch_port) {
                ironlake_fdi_disable(crtc);
-               lpt_disable_pch_transcoder(dev_priv, cpu_transcoder);
+               lpt_disable_pch_transcoder(dev_priv);
                ironlake_fdi_pll_disable(intel_crtc);
        }