Skip to content

Commit f77a2db

Browse files
committed
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: Imre Deak <imre.deak@intel.com> Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200330152244.11316-1-imre.deak@intel.com
1 parent e2ccf0d commit f77a2db

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/gpu/drm/i915/display/intel_ddi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
18991899
return;
19001900

19011901
dig_port = enc_to_dig_port(encoder);
1902-
intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
1902+
1903+
if (!intel_phy_is_tc(dev_priv, phy) ||
1904+
dig_port->tc_mode != TC_PORT_TBT_ALT)
1905+
intel_display_power_get(dev_priv,
1906+
dig_port->ddi_io_power_domain);
19031907

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

0 commit comments

Comments
 (0)