Module Name: src
Committed By: riastradh
Date: Wed Mar 19 18:04:32 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_ddi.c
Log Message:
Fix uninitialized variable wait in intel_ddi_prepare_link_retrain.
Move a line around, too, to avoid merge conflicts with upstream.
Noted by maxv@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Wed Mar 19 18:04:32 2014
@@ -1357,8 +1357,8 @@ void intel_ddi_prepare_link_retrain(stru
struct intel_dp *intel_dp = &intel_dig_port->dp;
struct drm_i915_private *dev_priv = encoder->dev->dev_private;
enum port port = intel_dig_port->port;
- bool wait;
uint32_t val;
+ bool wait = false;
if (I915_READ(DP_TP_CTL(port)) & DP_TP_CTL_ENABLE) {
val = I915_READ(DDI_BUF_CTL(port));
