---

yaml --- r: 228809 b: refs/heads/master c: b7f1de2 h: refs/heads/master i: 228807: a488e53 v: v3
git-mirror · Dec 15, 2010 · c819c57 · c819c57
1 parent 650324c
commit c819c57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);