Commit 6e8a36c1 authored by Imre Deak's avatar Imre Deak Committed by Rodrigo Vivi
Browse files

drm/i915/icl+: Don't enable DDI IO power on a TypeC port in TBT mode



The DDI IO power well must not be enabled for a TypeC port in TBT mode,
ensure this during driver loading/system resume.

This gets rid of error messages like
[drm] *ERROR* power well DDI E TC2 IO state mismatch (refcount 1/enabled 0)

and avoids leaking the power ref when disabling the output.

Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200330152244.11316-1-imre.deak@intel.com


(cherry picked from commit f77a2db2)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 17d0c106
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
		return;

	dig_port = enc_to_dig_port(encoder);
	intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);

	if (!intel_phy_is_tc(dev_priv, phy) ||
	    dig_port->tc_mode != TC_PORT_TBT_ALT)
		intel_display_power_get(dev_priv,
					dig_port->ddi_io_power_domain);

	/*
	 * AUX power is only needed for (e)DP mode, and for HDMI mode on TC