[Intel-gfx] [PATCH 01/16] drm/i915: Throw out BUGs from DPLL/PCH functions

[Jani Nikula]

On Tue, 15 Mar 2016, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> These BUGs don't serve any purpose IMO. Throw them out.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

For some other things I might insist on replacing them with warns, but I
don't think these ones warrant that.

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> ---
>  drivers/gpu/drm/i915/intel_display.c | 9 ---------
>  1 file changed, 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ce55f0b683c6..22930f05457c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1661,9 +1661,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);
> @@ -1839,9 +1836,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);
>  
> @@ -1895,9 +1889,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);

-- 
Jani Nikula, Intel Open Source Technology Center