drm/i915: remove IBX code from lpt_enable_pch_transcoder
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 31 Oct 2012 20:12:45 +0000 (18:12 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 11 Nov 2012 22:51:22 +0000 (23:51 +0100)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 9c5783cc69ddf580dc00534610526fbda45034b5..2de9a6e4b5fdebc15018a8528c14b99447331a5a 100644 (file)
@@ -1744,22 +1744,9 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
        val = I915_READ(reg);
        pipeconf_val = I915_READ(PIPECONF(pipe));
 
-       if (HAS_PCH_IBX(dev_priv->dev)) {
-               /*
-                * make the BPC in transcoder be consistent with
-                * that in pipeconf reg.
-                */
-               val &= ~PIPE_BPC_MASK;
-               val |= pipeconf_val & PIPE_BPC_MASK;
-       }
-
        val &= ~TRANS_INTERLACE_MASK;
        if ((pipeconf_val & PIPECONF_INTERLACE_MASK) == PIPECONF_INTERLACED_ILK)
-               if (HAS_PCH_IBX(dev_priv->dev) &&
-                   intel_pipe_has_type(crtc, INTEL_OUTPUT_SDVO))
-                       val |= TRANS_LEGACY_INTERLACED_ILK;
-               else
-                       val |= TRANS_INTERLACED;
+               val |= TRANS_INTERLACED;
        else
                val |= TRANS_PROGRESSIVE;