[Intel-gfx] [PATCH v3 3/8] drm/i915: Init aux_ch for HDMI ports too

[Souza, Jose]

On Wed, 2018-10-31 at 18:26 +0200, Imre Deak wrote:
> From ICL onwards DDI/TypeC ports - even in HDMI static mode - need to
> know
> which AUX CH belongs to them, so initialize aux_ch for those ports
> too.
> For consistency do this for all HDMI ports, not only for DDI/TypeC
> ones.
> 
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c  | 1 +
>  drivers/gpu/drm/i915/intel_dp.c   | 2 +-
>  drivers/gpu/drm/i915/intel_hdmi.c | 1 +
>  3 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index 32a080265d03..3739ef003819 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -3852,6 +3852,7 @@ void intel_ddi_init(struct drm_i915_private
> *dev_priv, enum port 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);
> +	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);
>  
>  	switch (port) {
>  	case PORT_A:
> diff --git a/drivers/gpu/drm/i915/intel_dp.c
> b/drivers/gpu/drm/i915/intel_dp.c
> index 5530c604c694..6645c9faca9a 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -1654,7 +1654,6 @@ intel_dp_aux_init(struct intel_dp *intel_dp)
>  	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
>  	struct intel_encoder *encoder = &dig_port->base;
>  
> -	dig_port->aux_ch = intel_aux_ch(dev_priv, encoder->port);
>  	intel_dp->aux_power_domain = intel_aux_power_domain(intel_dp);
>  
>  	if (INTEL_GEN(dev_priv) >= 9) {
> @@ -6706,6 +6705,7 @@ bool intel_dp_init(struct drm_i915_private
> *dev_priv,
>  	if (port != PORT_A)
>  		intel_infoframe_init(intel_dig_port);
>  
> +	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);
>  	if (!intel_dp_init_connector(intel_dig_port, intel_connector))
>  		goto err_init_connector;
>  
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
> b/drivers/gpu/drm/i915/intel_hdmi.c
> index 129b880bce64..b50c5497048a 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -2506,5 +2506,6 @@ void intel_hdmi_init(struct drm_i915_private
> *dev_priv,
>  
>  	intel_infoframe_init(intel_dig_port);
>  
> +	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);

Everything else looks good, I'm not just 100% confortable in
initializing it here just for consistency, can someone else comment
here?

>  	intel_hdmi_init_connector(intel_dig_port, intel_connector);
>  }