From 227ccf3162b9ab7cf027f45b20bda98b0e4cd4d6 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun, 4 Oct 2009 15:00:36 +0200
Subject: [PATCH] --- yaml --- r: 174523 b: refs/heads/master c:
 5c5a4359fe392b52b444134877fc4002be542b42 h: refs/heads/master i:   174521:
 223d7e284dcbf2b1112ef415efc4cd12be3422fc   174519:
 575a807c1918f7d57202d128196c996d41507d3e v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/gpu/drm/i915/intel_overlay.c | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 2d15c52cdd2c..d398b689ca98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1df4b35b61df27fc5b173fe2789d976e40e1dc22
+refs/heads/master: 5c5a4359fe392b52b444134877fc4002be542b42
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
index 972d715245be..f1bf0b0c204c 100644
--- a/trunk/drivers/gpu/drm/i915/intel_overlay.c
+++ b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -286,16 +286,15 @@ static int intel_overlay_wait_flip(struct intel_overlay *overlay)
 	RING_LOCALS;
 
 	if (overlay->last_flip_req != 0) {
-		ret = i915_do_wait_request(dev, overlay->last_flip_req, 0);
-		if (ret != 0)
-			return ret;
-
-		overlay->last_flip_req = 0;
+		ret = i915_do_wait_request(dev, overlay->last_flip_req, 1);
+		if (ret == 0) {
+			overlay->last_flip_req = 0;
 
-		tmp = I915_READ(ISR);
+			tmp = I915_READ(ISR);
 
-		if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
-			return 0;
+			if (!(tmp & I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
+				return 0;
+		}
 	}
 
 	/* synchronous slowpath */
@@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay,
 				return ret;
 
 		case SWITCH_OFF_STAGE_2:
-			printk("switch off 2\n");
-
 			BUG_ON(!overlay->vid_bo);
 			obj = overlay->vid_bo->obj;