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

Commit 27878ede authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Throw out BUGs from DPLL/PCH functions 



These BUGs don't serve any purpose IMO. Throw them out.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458052809-23426-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5b421c57

drivers/gpu/drm/i915/intel_display.c

+0 −9
Original line number Diff line number Diff line
@@ -1617,9 +1617,6 @@ static void i9xx_enable_pll(struct intel_crtc *crtc) 


	assert_pipe_disabled(dev_priv, crtc->pipe);



	/* No really, not for ILK+ */

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



	/* PLL is protected by panel, make sure we can write it */

	if (IS_MOBILE(dev) && !IS_I830(dev))

		assert_panel_unlocked(dev_priv, crtc->pipe);
@@ -1795,9 +1792,6 @@ static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv, 
	i915_reg_t reg;

	uint32_t val, pipeconf_val;



	/* PCH only available on ILK+ */

	BUG_ON(!HAS_PCH_SPLIT(dev));



	/* Make sure PCH DPLL is enabled */

	assert_shared_dpll_enabled(dev_priv, intel_crtc->config->shared_dpll);
@@ -1851,9 +1845,6 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv, 
{

	u32 val, pipeconf_val;



	/* PCH only available on ILK+ */

	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);

	assert_fdi_rx_enabled(dev_priv, TRANSCODER_A);