Revert "drm/i915: try to train DP even harder"
Subsystems (2)
PATCH 1/1 Revert "drm/i915: try to train DP even harder"
This reverts commit 0d71068835e2610576d369d6d4cbf90e0f802a71.
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...)
--- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1929,7 +1929,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" );
Signature · 1 line
1.8.1.4
Daniel Vetter
AppliedQuoted 11 lines · Takashi Iwai
This reverts commit
0d71068835e2610576d369d6d4cbf90e0f802a71.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 <[email protected]>Signed-off-by Takashi Iwai <[email protected]>
Picked up for -fixes, thanks for the patch. Adding Paulo since it's his patch. To assign proper blame please cc: relevant people when sending out reverts.
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
At Sun, 17 Mar 2013 22:59:22 +0100,
Quoted 8 lines · Daniel Vetter
Quoted 6 lines · Takashi Iwai
This reverts commit
0d71068835e2610576d369d6d4cbf90e0f802a71.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.
Quoted 6 lines
Quoted 5 lines
At least reverting this commit recovers the framebuffer (but X is still broken by other reasons...)
Cc <[email protected]>Signed-off-by Takashi Iwai <[email protected]>Picked up for -fixes, thanks for the patch.
Thanks!
Quoted 3 lines
Adding Paulo since it's his
patch. To assign proper blame please cc: relevant people when sending out reverts.
Well, Paulo was on Cc in the first post, but I dropped in the next patch series since I've got no reply since then. (And intel-gfx was on Cc, so he could read it anyway...)
Takashi