Skip to content

Commit 6e8a36c

Browse files
ideakrodrigovivi
authored andcommitted
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: <[email protected]> # v5.4+ Signed-off-by: Imre Deak <[email protected]> Reviewed-by: José Roberto de Souza <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit f77a2db) Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 17d0c10 commit 6e8a36c

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
@@ -1869,7 +1869,11 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
18691869
return;
18701870

18711871
dig_port = enc_to_dig_port(encoder);
1872-
intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
1872+
1873+
if (!intel_phy_is_tc(dev_priv, phy) ||
1874+
dig_port->tc_mode != TC_PORT_TBT_ALT)
1875+
intel_display_power_get(dev_priv,
1876+
dig_port->ddi_io_power_domain);
18731877

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

0 commit comments

Comments
 (0)