---

yaml --- r: 200761 b: refs/heads/master c: 70565d0 h: refs/heads/master i: 200759: 0cff4b0 v: v3
git-mirror · Jul 2, 2010 · c73d054 · c73d054
1 parent 2706a8e
commit c73d054
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: dd1ea37d9257bdf118693235dc74003901c55204
+refs/heads/master: 70565d00db6ef5735819db973fa8da95bd34a6ab
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -947,9 +947,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 		}
 
 		if (iir & I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT) {
+			intel_prepare_page_flip(dev, 1);
 			if (dev_priv->flip_pending_is_done)
 				intel_finish_page_flip_plane(dev, 1);
-			intel_prepare_page_flip(dev, 1);
 		}
 
 		if (pipea_stats & vblank_status) {