[Intel-gfx] [PATCH 1/9] drm/i915: Fix iboost setting for DDI with 4 lanes on SKL

[David Weinehall]

On Tue, Jul 12, 2016 at 03:59:28PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Bspec says:
> "For DDIA with x4 capability (DDI_BUF_CTL DDIA Lane Capability Control =
>  DDIA x4), the I_boost value has to be programmed in both
>  tx_blnclegsctl_0 and tx_blnclegsctl_4."
> 
> Currently we only program tx_blnclegsctl_0. Let's do the other one as
> well.

Nice find.

Reviewed-by: David Weinehall <david.weinehall at linux.intel.com>

> Cc: David Weinehall <david.weinehall at linux.intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h  |  1 +
>  drivers/gpu/drm/i915/intel_ddi.c | 36 +++++++++++++++++++++++-------------
>  2 files changed, 24 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 8bfde75789f6..e6f9f05b3a4a 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1536,6 +1536,7 @@ enum skl_disp_power_wells {
>  #define BALANCE_LEG_MASK(port)		(7<<(8+3*(port)))
>  /* Balance leg disable bits */
>  #define BALANCE_LEG_DISABLE_SHIFT	23
> +#define BALANCE_LEG_DISABLE(port)	(1 << (23 + (port)))
>  
>  /*
>   * Fence registers
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index dd1d6fe12297..75354cd9bbab 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1379,14 +1379,30 @@ void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc)
>  			   TRANS_CLK_SEL_DISABLED);
>  }
>  
> -static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
> -			       u32 level, enum port port, int type)
> +static void _skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
> +				enum port port, uint8_t iboost)
>  {
> +	u32 tmp;
> +
> +	tmp = I915_READ(DISPIO_CR_TX_BMU_CR0);
> +	tmp &= ~(BALANCE_LEG_MASK(port) | BALANCE_LEG_DISABLE(port));
> +	if (iboost)
> +		tmp |= iboost << BALANCE_LEG_SHIFT(port);
> +	else
> +		tmp |= BALANCE_LEG_DISABLE(port);
> +	I915_WRITE(DISPIO_CR_TX_BMU_CR0, tmp);
> +}
> +
> +static void skl_ddi_set_iboost(struct intel_encoder *encoder, u32 level)
> +{
> +	struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base);
> +	struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev);
> +	enum port port = intel_dig_port->port;
> +	int type = encoder->type;
>  	const struct ddi_buf_trans *ddi_translations;
>  	uint8_t iboost;
>  	uint8_t dp_iboost, hdmi_iboost;
>  	int n_entries;
> -	u32 reg;
>  
>  	/* VBT may override standard boost values */
>  	dp_iboost = dev_priv->vbt.ddi_port_info[port].dp_boost_level;
> @@ -1428,16 +1444,10 @@ static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
>  		return;
>  	}
>  
> -	reg = I915_READ(DISPIO_CR_TX_BMU_CR0);
> -	reg &= ~BALANCE_LEG_MASK(port);
> -	reg &= ~(1 << (BALANCE_LEG_DISABLE_SHIFT + port));
> -
> -	if (iboost)
> -		reg |= iboost << BALANCE_LEG_SHIFT(port);
> -	else
> -		reg |= 1 << (BALANCE_LEG_DISABLE_SHIFT + port);
> +	_skl_ddi_set_iboost(dev_priv, port, iboost);
>  
> -	I915_WRITE(DISPIO_CR_TX_BMU_CR0, reg);
> +	if (port == PORT_A && intel_dig_port->max_lanes == 4)
> +		_skl_ddi_set_iboost(dev_priv, PORT_E, iboost);
>  }
>  
>  static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
> @@ -1568,7 +1578,7 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp)
>  	level = translate_signal_level(signal_levels);
>  
>  	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
> -		skl_ddi_set_iboost(dev_priv, level, port, encoder->type);
> +		skl_ddi_set_iboost(encoder, level);
>  	else if (IS_BROXTON(dev_priv))
>  		bxt_ddi_vswing_sequence(dev_priv, level, port, encoder->type);
>  
> -- 
> 2.7.4
>