[Intel-gfx] [PATCH] drm/i915: Only complain about n_edp_entries with eDP ports

[Daniel Vetter]

On Tue, Jan 12, 2016 at 05:28:16PM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> commit 10afa0b65fe2 ("drm/i915: Reject >9 ddi translation entried if port != A/E on SKL")
> added sanity checks to make sure we don't end up with too many ddi translation
> values for eDP ports, but it actually failed to check if the port is eDP.
> We still look up the edp translations for non-eDP ports, but don't use
> them, so we shouldn't be complaining about them either.
> 
> Fixes: 10afa0b65fe2 ("drm/i915: Reject >9 ddi translation entried if port != A/E on SKL")
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index d348506f847c..1f9a3687b540 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -436,8 +436,9 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
>  		    dev_priv->vbt.ddi_port_info[port].dp_boost_level)
>  			iboost_bit = 1<<31;
>  
> -		if (WARN_ON(port != PORT_A &&
> -			    port != PORT_E && n_edp_entries > 9))
> +		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;
> -- 
> 2.4.10
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch