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

Commit 55522f37 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Check of !HAS_PCH_SPLIT() in PCH transcoder funcs 



Check for !HAS_PCH_SPLIT() instead of 'gen < 5' in the PCH transcoder
enable functions.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a3ed6aad

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1858,7 +1858,7 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, 
	uint32_t reg, val, pipeconf_val;



	/* PCH only available on ILK+ */

	BUG_ON(INTEL_INFO(dev)->gen < 5);

	BUG_ON(!HAS_PCH_SPLIT(dev));



	/* Make sure PCH DPLL is enabled */

	assert_shared_dpll_enabled(dev_priv,
@@ -1911,7 +1911,7 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv, 
	u32 val, pipeconf_val;



	/* PCH only available on ILK+ */

	BUG_ON(INTEL_INFO(dev_priv->dev)->gen < 5);

	BUG_ON(!HAS_PCH_SPLIT(dev_priv->dev));



	/* FDI must be feeding us bits for PCH ports */

	assert_fdi_tx_enabled(dev_priv, (enum pipe) cpu_transcoder);