diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-04-03 05:29:07 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2013-04-03 05:29:07 +0000 |
| commit | dbb7631e94ebbaf8d3af6b5f51d68ba7ce95d633 (patch) | |
| tree | 58996d8fc8b8cb2d754321a2414062cd5efd11d9 /sys/dev/pci | |
| parent | 6296d2e27d6b1b480991f21fc6c5ae56ca1aa007 (diff) | |
match linux 3.8.5 and backout the 'try to train DP even harder' commit
which introduced a bogus check that could lead to an infinite loop
in some eDP setups.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/intel_dp.c b/sys/dev/pci/drm/i915/intel_dp.c index 71929c8b2b6..2997dd6e369 100644 --- a/sys/dev/pci/drm/i915/intel_dp.c +++ b/sys/dev/pci/drm/i915/intel_dp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_dp.c,v 1.1 2013/03/18 12:36:52 jsg Exp $ */ +/* $OpenBSD: intel_dp.c,v 1.2 2013/04/03 05:29:06 jsg Exp $ */ /* * Copyright © 2008 Intel Corporation * @@ -2013,7 +2013,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"); |