diff -ur linux-4.5.0-gentoo.orig/drivers/gpu/drm/i915/intel_dp_link_training.c linux-4.5.0-gentoo/drivers/gpu/drm/i915/intel_dp_link_training.c
--- linux-4.5.0-gentoo.orig/drivers/gpu/drm/i915/intel_dp_link_training.c	2016-03-14 05:28:54.000000000 +0100
+++ linux-4.5.0-gentoo/drivers/gpu/drm/i915/intel_dp_link_training.c	2016-03-15 20:45:27.964212409 +0100
@@ -161,23 +160,6 @@
 			break;
 		}
 
-		/*
-		 * if we used previously trained voltage and pre-emphasis values
-		 * and we don't get clock recovery, reset link training values
-		 */
-		if (intel_dp->train_set_valid) {
-			DRM_DEBUG_KMS("clock recovery not ok, reset");
-			/* clear the flag as we are not reusing train set */
-			intel_dp->train_set_valid = false;
-			if (!intel_dp_reset_link_train(intel_dp,
-						       DP_TRAINING_PATTERN_1 |
-						       DP_LINK_SCRAMBLING_DISABLE)) {
-				DRM_ERROR("failed to enable link training\n");
-				return;
-			}
-			continue;
-		}
-
 		/* Check to see if we've tried the max voltage */
 		for (i = 0; i < intel_dp->lane_count; i++)
 			if ((intel_dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0)