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

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

drm/i915: don't assert_pch_pll_enabled on lpt_enable_pch_transcoder 



These asserts are specific to IBX/CPT/PPT. Inside the assert_pch_pll
function we even "return" in case we detect LPT, but I prefer to just
not call it. In the future we might rename to something like
ibx_assert_pch_pll.

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

drivers/gpu/drm/i915/intel_display.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1722,16 +1722,10 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv, 
{

{

	int reg;

	int reg;

	u32 val, pipeconf_val;

	u32 val, pipeconf_val;

	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];





	/* PCH only available on ILK+ */

	/* PCH only available on ILK+ */

	BUG_ON(dev_priv->info->gen < 5);

	BUG_ON(dev_priv->info->gen < 5);





	/* Make sure PCH DPLL is enabled */

	assert_pch_pll_enabled(dev_priv,

			       to_intel_crtc(crtc)->pch_pll,

			       to_intel_crtc(crtc));



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

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

	assert_fdi_tx_enabled(dev_priv, pipe);

	assert_fdi_tx_enabled(dev_priv, pipe);

	assert_fdi_rx_enabled(dev_priv, pipe);

	assert_fdi_rx_enabled(dev_priv, pipe);