[Intel-gfx] [PATCH] drm/i915/icl: do not save DDI A/E sharing bit for ICL

[Paulo Zanoni]

Em Ter, 2018-03-06 às 12:41 +0200, Jani Nikula escreveu:
> We don't want to preserve the DDI A 4 lane bit on ICL.
> 

Why not review https://patchwork.freedesktop.org/patch/206118/ instead?
 :)

> Fixes: 3d2011cfa41f ("drm/i915/icl: remove port A/E lane sharing
> limitation.")
> Cc: Mahesh Kumar <mahesh1.kumar at intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index bfdaa5d86861..66417dd24bfc 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2932,9 +2932,12 @@ void intel_ddi_init(struct drm_i915_private
> *dev_priv, enum port port)
>  	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
>  	intel_encoder->cloneable = 0;
>  
> -	intel_dig_port->saved_port_bits =
> I915_READ(DDI_BUF_CTL(port)) &
> -					  (DDI_BUF_PORT_REVERSAL |
> -					   DDI_A_4_LANES);
> +	if (INTEL_GEN(dev_priv) >= 11)
> +		intel_dig_port->saved_port_bits =
> I915_READ(DDI_BUF_CTL(port)) &
> +			DDI_BUF_PORT_REVERSAL;
> +	else
> +		intel_dig_port->saved_port_bits =
> I915_READ(DDI_BUF_CTL(port)) &
> +			(DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);
>  	intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
>  	intel_dig_port->max_lanes =
> intel_ddi_max_lanes(intel_dig_port);
>