From: Paulo Zanoni <paulo.r.zanoni at intel.com>
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 at intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c495bfa..310f2f2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1761,15 +1761,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);
@@ -3588,7 +3583,7 @@ static void haswell_crtc_disable(struct drm_crtc *crtc)
encoder->post_disable(encoder);
if (is_pch_port) {
- lpt_disable_pch_transcoder(dev_priv, cpu_transcoder);
+ lpt_disable_pch_transcoder(dev_priv);
intel_ddi_fdi_disable(crtc);
}
--
1.7.11.4
