---

yaml --- r: 307457 b: refs/heads/master c: a9dcf84 h: refs/heads/master i: 307455: a04b7ef v: v3
git-mirror · May 19, 2012 · 68385a5 · 68385a5
1 parent 9aa3b3f
commit 68385a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83ee9e645846f0c56bd9b33ee28ead03b416bb25
+refs/heads/master: a9dcf84b14ef4e9a609910367576995e6f32f3dc
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6253,10 +6253,11 @@ static void intel_sanitize_modesetting(struct drm_device *dev,
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 reg, val;
+	int i;
 
 	/* Clear any frame start delays used for debugging left by the BIOS */
-	for_each_pipe(pipe) {
-		reg = PIPECONF(pipe);
+	for_each_pipe(i) {
+		reg = PIPECONF(i);
 		I915_WRITE(reg, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
 	}