[Intel-gfx] [PATCH 6/8] drm/i915: Enable AUX power for HDMI DDI/TypeC main link too

[Souza, Jose]

On Tue, 2018-10-30 at 17:40 +0200, Imre Deak wrote:
> DDI/TypeC ports need the AUX power domain for main link functionality
> even when they operate in HDMI static mode, so enable the power
> domain
> for these ports too.
> 

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> b/drivers/gpu/drm/i915/intel_ddi.c
> index 7731ca704862..bf58816ed59c 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -2103,6 +2103,7 @@ intel_ddi_main_link_aux_domain(struct
> intel_digital_port *dig_port)
>  static u64 intel_ddi_get_power_domains(struct intel_encoder
> *encoder,
>  				       struct intel_crtc_state
> *crtc_state)
>  {
> +	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	struct intel_digital_port *dig_port;
>  	u64 domains;
>  
> @@ -2117,8 +2118,12 @@ static u64 intel_ddi_get_power_domains(struct
> intel_encoder *encoder,
>  	dig_port = enc_to_dig_port(&encoder->base);
>  	domains = BIT_ULL(dig_port->ddi_io_power_domain);
>  
> -	/* AUX power is only needed for (e)DP mode, not for HDMI. */
> -	if (intel_crtc_has_dp_encoder(crtc_state))
> +	/*
> +	 * AUX power is only needed for (e)DP mode, and for HDMI mode
> on TC
> +	 * ports.
> +	 */
> +	if (intel_crtc_has_dp_encoder(crtc_state) ||
> +	    intel_port_is_tc(dev_priv, encoder->port))
>  		domains |=
> BIT_ULL(intel_ddi_main_link_aux_domain(dig_port));
>  
>  	return domains;
> @@ -2894,7 +2899,8 @@ intel_ddi_pre_pll_enable(struct intel_encoder
> *encoder,
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder-
> >base);
>  
> -	if (intel_crtc_has_dp_encoder(crtc_state))
> +	if (intel_crtc_has_dp_encoder(crtc_state) ||
> +	    intel_port_is_tc(dev_priv, encoder->port))
>  		intel_display_power_get(dev_priv,
>  					intel_ddi_main_link_aux_domain(
> dig_port));
>  }
> @@ -2907,7 +2913,8 @@ intel_ddi_post_pll_disable(struct intel_encoder
> *encoder,
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder-
> >base);
>  
> -	if (intel_crtc_has_dp_encoder(crtc_state))
> +	if (intel_crtc_has_dp_encoder(crtc_state) ||
> +	    intel_port_is_tc(dev_priv, encoder->port))
>  		intel_display_power_put(dev_priv,
>  					intel_ddi_main_link_aux_domain(
> dig_port));
>  }