Skip to content

Commit 4974826

Browse files
committed
drm/i915/dp: Do not switch aux to TBT mode for non-TC ports
Non-TC ports always have tc_mode == TC_PORT_TBT_ALT so it was switching aux to TBT mode for all combo-phy ports, happily this did not caused any issue but is better follow BSpec. Also this is reserved bit before ICL. Cc: Imre Deak <[email protected]> Signed-off-by: José Roberto de Souza <[email protected]> Fixes: e9b7e14 ("drm/i915: Sanitize the terminology used for TypeC port modes") Reviewed-by: Imre Deak <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 034982c commit 4974826

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,6 +1293,9 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
12931293
u32 unused)
12941294
{
12951295
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
1296+
struct drm_i915_private *i915 =
1297+
to_i915(intel_dig_port->base.base.dev);
1298+
enum phy phy = intel_port_to_phy(i915, intel_dig_port->base.port);
12961299
u32 ret;
12971300

12981301
ret = DP_AUX_CH_CTL_SEND_BUSY |
@@ -1305,7 +1308,8 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
13051308
DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) |
13061309
DP_AUX_CH_CTL_SYNC_PULSE_SKL(32);
13071310

1308-
if (intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
1311+
if (intel_phy_is_tc(i915, phy) &&
1312+
intel_dig_port->tc_mode == TC_PORT_TBT_ALT)
13091313
ret |= DP_AUX_CH_CTL_TBT_IO;
13101314

13111315
return ret;

0 commit comments

Comments
 (0)