---

yaml --- r: 210187 b: refs/heads/master c: 0ad6ef2 h: refs/heads/master i: 210185: 68ed506 210183: 2071d79 v: v3
git-mirror · Sep 7, 2010 · 2641d86 · 2641d86
1 parent 0d29db0
commit 2641d86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e6cfefc729be2aa20647415317577ed98d4f7bf
+refs/heads/master: 0ad6ef2c587dea59212c4e2ab3ec3b0067500a2a
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -2069,7 +2069,7 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
 			I915_WRITE(transconf_reg, temp | TRANS_ENABLE);
 			I915_READ(transconf_reg);
 
-			if (wait_for(I915_READ(transconf_reg) & TRANS_STATE_ENABLE, 10, 0))
+			if (wait_for(I915_READ(transconf_reg) & TRANS_STATE_ENABLE, 100, 1))
 				DRM_ERROR("failed to enable transcoder\n");
 		}