[Intel-gfx] [PATCH 1/2] drm/i915: Move down skl/kbl ddi iboost and n_edp_entires fixup

[Manasi Navare]

On Fri, Sep 30, 2016 at 11:05:56AM -0700, Rodrigo Vivi wrote:
> No functional change.
> Only moving this fixup block out of ddi_translation definitions
> so we can split skl and kbl cleanly.
> 
> Cc: Manasi Navare <manasi.d.navare at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com
 Reviewed-by: Manasi Navare <manasi.d.navare at intel.com>
>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 35f0b7c..018964b 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -436,15 +436,6 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)
>  				skl_get_buf_trans_dp(dev_priv, &n_dp_entries);
>  		ddi_translations_edp =
>  				skl_get_buf_trans_edp(dev_priv, &n_edp_entries);
> -
> -		/* If we're boosting the current, set bit 31 of trans1 */
> -		if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
> -			iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
> -
> -		if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&
> -			    port != PORT_A && port != PORT_E &&
> -			    n_edp_entries > 9))
> -			n_edp_entries = 9;
>  	} else if (IS_BROADWELL(dev_priv)) {
>  		ddi_translations_fdi = bdw_ddi_translations_fdi;
>  		ddi_translations_dp = bdw_ddi_translations_dp;
> @@ -464,6 +455,18 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)
>  		n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
>  	}
>  
> +	/* Skylake/Kabylake iboost and edp_entries fixup */
> +	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
> +		/* If we're boosting the current, set bit 31 of trans1 */
> +		if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
> +			iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
> +
> +		if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&
> +			    port != PORT_A && port != PORT_E &&
> +			    n_edp_entries > 9))
> +			n_edp_entries = 9;
> +	}
> +
>  	switch (encoder->type) {
>  	case INTEL_OUTPUT_EDP:
>  		ddi_translations = ddi_translations_edp;
> -- 
> 1.9.1
>