diff --git a/[refs] b/[refs]
index bbcf11bcba97..57cf54eaed3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5e0d2f51977fe1f7fd6ee5c1a4476b43bad8f92
+refs/heads/master: 8c4223bee91b771782f2ec07f2c85d81cdff3ed5
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index 95c841640508..df410e4827e4 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1989,8 +1989,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	if ((temp & DPLL_VCO_ENABLE) == 0) {
 		I915_WRITE(pch_dpll_reg, temp | DPLL_VCO_ENABLE);
 		I915_READ(pch_dpll_reg);
+		udelay(200);
 	}
-	udelay(200);
 
 	if (HAS_PCH_CPT(dev)) {
 		/* Be sure PCH DPLL SEL is set */
@@ -2136,8 +2136,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
 	} else
 		DRM_DEBUG_KMS("crtc %d is disabled\n", pipe);
 
-	udelay(100);
-
 	/* Disable PF */
 	I915_WRITE(pipe ? PFB_CTL_1 : PFA_CTL_1, 0);
 	I915_WRITE(pipe ? PFB_WIN_SZ : PFA_WIN_SZ, 0);