Skip to content

Commit 4e78c33

Browse files
vsyrjalagregkh
authored andcommitted
drm/i915: Skip vswing programming for TBT
commit eaf5bfe upstream. In thunderbolt mode the PHY is owned by the thunderbolt controller. We are not supposed to touch it. So skip the vswing programming as well (we already skipped the other steps not applicable to TBT). Touching this stuff could supposedly interfere with the PHY programming done by the thunderbolt controller. Cc: stable@vger.kernel.org Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210128155948.13678-1-ville.syrjala@linux.intel.com Reviewed-by: Imre Deak <imre.deak@intel.com> (cherry picked from commit f8c6b61) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 43f39b8 commit 4e78c33

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,6 +2597,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
25972597
u32 n_entries, val;
25982598
int ln, rate = 0;
25992599

2600+
if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT)
2601+
return;
2602+
26002603
if (type != INTEL_OUTPUT_HDMI) {
26012604
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
26022605

@@ -2741,6 +2744,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
27412744
u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
27422745
int rate = 0;
27432746

2747+
if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT)
2748+
return;
2749+
27442750
if (type != INTEL_OUTPUT_HDMI) {
27452751
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
27462752

0 commit comments

Comments
 (0)