From c819c576ff63d57a77928e1ef7f6c0f29ea97ece Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 14 Dec 2010 16:09:31 +0000
Subject: [PATCH] --- yaml --- r: 228809 b: refs/heads/master c:
 b7f1de289c50beb4998611ba5373e539efd0f79f h: refs/heads/master i:   228807:
 a488e53e9fdd5961164f5e9d20bbab66249bb35a v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index befab96c583d..66d5a8d90dff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6df541c00e53a4fdff7a130d4365f848075adcc
+refs/heads/master: b7f1de289c50beb4998611ba5373e539efd0f79f
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
index f2d50141e0c2..840bfc3ae719 100644
--- a/trunk/drivers/gpu/drm/i915/intel_display.c
+++ b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -1626,8 +1626,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		return ret;
 	}
 
-	if (old_fb)
+	if (old_fb) {
+		intel_wait_for_vblank(dev, intel_crtc->pipe);
 		i915_gem_object_unpin(to_intel_framebuffer(old_fb)->obj);
+	}
 
 	mutex_unlock(&dev->struct_mutex);