---

yaml --- r: 228775 b: refs/heads/master c: a589b9f h: refs/heads/master i: 228773: 51631b1 228771: b553da4 228767: 96888c2 v: v3
git-mirror · Dec 5, 2010 · f4acefe · f4acefe
1 parent f2d2a40
commit f4acefe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17fe6981109e995f36723e4880a97d48fa38920a
+refs/heads/master: a589b9f429ac0e5bcdebda0f74ee313d39d69b7f
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4089,13 +4089,13 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 			}
 			I915_WRITE(DPLL_MD(pipe), temp);
 		} else {
-			/* write it again -- the BIOS does, after all */
+			/* The pixel multiplier can only be updated once the
+			 * DPLL is enabled and the clocks are stable.
+			 *
+			 * So write it again.
+			 */
 			I915_WRITE(dpll_reg, dpll);
 		}
-
-		/* Wait for the clocks to stabilize. */
-		POSTING_READ(dpll_reg);
-		udelay(150);
 	}
 
 	intel_crtc->lowfreq_avail = false;