On Wed, 2019-03-13 at 14:11 -0700, Rodrigo Vivi wrote:
> From: Bob Paauwe <bob.j.paauwe@intel.com>
> 
> Unlike ICL, all of the output ports are combo phys so just return
> true in is_port_combophy for all EHL ports to indicate that.
> 
> Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 2b25098d47a9..920f647bd451 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6170,6 +6170,9 @@ bool intel_port_is_combophy(struct
> drm_i915_private *dev_priv, enum port port)
>  	if (port == PORT_NONE)
>  		return false;
>  
> +	if (IS_ELKHARTLAKE(dev_priv))
> +		return port <= PORT_C;
> +
>  	if (INTEL_GEN(dev_priv) >= 11)
>  		return port <= PORT_B;
>  


You also need to change intel_port_is_tc(), several places only checks
for it and it would be broken for PORT_C in EHL.

bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port
port)
{
	if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
		return port >= PORT_C && port <= PORT_F;

	return false;
}