Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e4a3ad9 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: Enable AUX power for HDMI DDI/TypeC main link too 



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.

v4:
- Rebase on the upstream ICL pre_pll_enable change.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181101140427.31026-7-imre.deak@intel.com
parent bdaa29b6

drivers/gpu/drm/i915/intel_ddi.c

+9 −3
Original line number Diff line number Diff line
@@ -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;
@@ -3331,7 +3336,8 @@ intel_ddi_pre_pll_enable(struct intel_encoder *encoder, 
	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	enum port port = encoder->port;



	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));