Commit 3b4f819d authored Mar 11, 2013 by Takashi Iwai Committed by Daniel Vetter Mar 17, 2013

Revert "drm/i915: try to train DP even harder"



This reverts commit 0d710688.

Not only that the commit introduces a bogus check (voltage_tries == 5
will never meet at the inserted code path), it brings the i915 driver
into an endless dp-train loop on HP Z1 desktop machine with IVY+eDP.

At least reverting this commit recovers the framebuffer (but X is
still broken by other reasons...)

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3118a4f6

drivers/gpu/drm/i915/intel_dp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1930,7 +1930,7 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)
		for (i = 0; i < intel_dp->lane_count; i++)
		if ((intel_dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0)
		break;
		if (i == intel_dp->lane_count && voltage_tries == 5) {
		if (i == intel_dp->lane_count) {
		++loop_tries;
		if (loop_tries == 5) {
		DRM_DEBUG_KMS("too many full retries, give up\n");