| Message ID | 1348674510-19494-1-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 26, 2012 at 4:48 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > In commit cdb0e95bf571dccc1f75fef9bdad21b167ef0b37 > Author: Keith Packard <keithp@keithp.com> > Date: Tue Nov 1 20:00:06 2011 -0700 > > drm/i915: Try harder during dp pattern 1 link training > > extra passes were made to retry the same voltage and then retry a full > clock reset. However, as coverity pointed out, we never tried the full > clock reset as we broke out of the loop early. Took me a while to wrap my head around this one, no wonder only Coverity pointed out. I managed to convince myself the fix is correct though. Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
On Wed, Oct 03, 2012 at 02:50:19PM +0100, Lespiau, Damien wrote: > On Wed, Sep 26, 2012 at 4:48 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote: > > In commit cdb0e95bf571dccc1f75fef9bdad21b167ef0b37 > > Author: Keith Packard <keithp@keithp.com> > > Date: Tue Nov 1 20:00:06 2011 -0700 > > > > drm/i915: Try harder during dp pattern 1 link training > > > > extra passes were made to retry the same voltage and then retry a full > > clock reset. However, as coverity pointed out, we never tried the full > > clock reset as we broke out of the loop early. > > Took me a while to wrap my head around this one, no wonder only > Coverity pointed out. I managed to convince myself the fix is correct > though. > > Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Picked up for -fixes, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index a6ef745..46897f0 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1827,8 +1827,7 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) if ((intel_dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0) break; if (i == intel_dp->lane_count && voltage_tries == 5) { - ++loop_tries; - if (loop_tries == 5) { + if (++loop_tries == 5) { DRM_DEBUG_KMS("too many full retries, give up\n"); break; } @@ -1838,15 +1837,11 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) } /* Check to see if we've tried the same voltage 5 times */ - if ((intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK) == voltage) { - ++voltage_tries; - if (voltage_tries == 5) { - DRM_DEBUG_KMS("too many voltage retries, give up\n"); - break; - } - } else + if ((intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK) != voltage) { + voltage = intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK; voltage_tries = 0; - voltage = intel_dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK; + } else + ++voltage_tries; /* Compute new intel_dp->train_set as requested by target */ intel_get_adjust_train(intel_dp, link_status);
In commit cdb0e95bf571dccc1f75fef9bdad21b167ef0b37 Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 1 20:00:06 2011 -0700 drm/i915: Try harder during dp pattern 1 link training extra passes were made to retry the same voltage and then retry a full clock reset. However, as coverity pointed out, we never tried the full clock reset as we broke out of the loop early. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_dp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)