From: Paulo Zanoni Date: Wed, 31 Oct 2012 20:12:44 +0000 (-0200) Subject: drm/i915: remove Haswell code from ironlake_enable_pch_transcoder X-Git-Tag: MMI-PSA29.97-13-9~15304^2~193^2~54 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25e78e90f33a783e8129e29c1a567a63300ca8ce;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: remove Haswell code from ironlake_enable_pch_transcoder Since now we have lpt_enable_pch_transcoder. Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 97365b851976..9c5783cc69dd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1689,10 +1689,6 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, assert_fdi_tx_enabled(dev_priv, pipe); assert_fdi_rx_enabled(dev_priv, pipe); - if (IS_HASWELL(dev_priv->dev) && pipe > 0) { - DRM_ERROR("Attempting to enable transcoder on Haswell with pipe > 0\n"); - return; - } reg = TRANSCONF(pipe); val = I915_READ(reg); pipeconf_val = I915_READ(PIPECONF(pipe));