Commit b6d572ae authored by Mika Westerberg's avatar Mika Westerberg
Browse files

thunderbolt: Increase DisplayPort Connection Manager handshake timeout 



It turns out that when plugging in VGA cable through USB-C to VGA/DVI
dongle the Connection Manager handshake can take longer time, at least
on Intel Titan Ridge based docks such as Dell WD91TB. This leads to
following error in the dmesg:

  thunderbolt 0000:00:0d.3: 3:10: DP tunnel activation failed, aborting

and the display stays blank (because we failed to establish the tunnel).
For this reason increase the timeout to 3s.

Reported-by: default avatarKoba Ko <koba.ko@canonical.com>
Cc: stable@vger.kernel.org
Acked-By: default avatarYehezkel Bernat <YehezkelShB@gmail.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 70c2e03e

drivers/thunderbolt/tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int tb_dp_xchg_caps(struct tb_tunnel *tunnel) 
	 * Perform connection manager handshake between IN and OUT ports

	 * before capabilities exchange can take place.

	 */

	ret = tb_dp_cm_handshake(in, out, 1500);

	ret = tb_dp_cm_handshake(in, out, 3000);

	if (ret)

		return ret;