Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a35f2679 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: remove IBX code from lpt_enable_pch_transcoder 



Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 25e78e90

drivers/gpu/drm/i915/intel_display.c

+1 −14
Original line number Diff line number Diff line
@@ -1744,21 +1744,8 @@ 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;

	else

		val |= TRANS_PROGRESSIVE;