diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/.lastcommit xserver-xorg-video-intel-2.21.4+git20130314.92023f39/.lastcommit
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/.lastcommit	2013-03-13 19:36:08.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/.lastcommit	2013-03-14 19:01:29.000000000 +0000
@@ -1 +1 @@
-commit 80401f4fe54142c16ea7578b587529610b68cb67
+commit 92023f39a9c8897e5a978f44b7970773b118f628
diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/ChangeLog xserver-xorg-video-intel-2.21.4+git20130314.92023f39/ChangeLog
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/ChangeLog	2013-03-13 19:36:22.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/ChangeLog	2013-03-14 19:01:56.000000000 +0000
@@ -1,9 +1,19 @@
-commit 4a0f2bca2081cc10c9695a0f4f597908c79dbbb4
+commit d114d00473bd7ed47aacc56eb9c2ae18e8025efb
 Author: Robert Hooker <sarvatt@ubuntu.com>
-Date:   Wed Mar 13 15:36:08 2013 -0400
+Date:   Thu Mar 14 15:01:29 2013 -0400
 
     Add debian tree from origin/ubuntu
 
+commit 92023f39a9c8897e5a978f44b7970773b118f628
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Thu Mar 14 09:42:37 2013 +0000
+
+    sna: Add a few more assertions to track userptr through the caches
+    
+    i.e. make sure they don't end up in any caches.
+    
+    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
 commit 80401f4fe54142c16ea7578b587529610b68cb67
 Author: Chris Wilson <chris@chris-wilson.co.uk>
 Date:   Wed Mar 13 11:01:45 2013 +0000
diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/debian/changelog xserver-xorg-video-intel-2.21.4+git20130314.92023f39/debian/changelog
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/debian/changelog	2013-03-14 19:14:16.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/debian/changelog	2013-03-14 19:14:16.000000000 +0000
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.21.4+git20130313.80401f4f-0ubuntu0sarvatt~quantal) quantal; urgency=low
+xserver-xorg-video-intel (2:2.21.4+git20130314.92023f39-0ubuntu0sarvatt~quantal) quantal; urgency=critical
 
-  * Checkout from git 20130313 (master branch) up to commit
-    80401f4fe54142c16ea7578b587529610b68cb67
+  * Checkout from git 20130314 (master branch) up to commit
+    92023f39a9c8897e5a978f44b7970773b118f628
   * Only added debian/ tree from origin/ubuntu
   * hook: Refresh 0002-Update-manpage-for-new-accelmethod-option.patch
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Wed, 13 Mar 2013 15:36:23 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com>  Thu, 14 Mar 2013 15:01:57 -0400
 
 xserver-xorg-video-intel (2:2.21.3-0ubuntu1) raring; urgency=low
 
diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/kgem.c xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/kgem.c
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/kgem.c	2013-03-13 19:36:07.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/kgem.c	2013-03-14 19:01:29.000000000 +0000
@@ -1514,6 +1514,7 @@
 	assert(!bo->proxy);
 	assert(!bo->io);
 	assert(!bo->scanout);
+	assert(!bo->snoop);
 	assert(!bo->needs_flush);
 	assert(list_is_empty(&bo->vma));
 	ASSERT_IDLE(kgem, bo->handle);
@@ -1647,6 +1648,9 @@
 
 static void kgem_bo_move_to_snoop(struct kgem *kgem, struct kgem_bo *bo)
 {
+	assert(bo->reusable);
+	assert(!bo->flush);
+	assert(!bo->needs_flush);
 	assert(bo->refcnt == 0);
 	assert(bo->exec == NULL);
 
@@ -1738,14 +1742,12 @@
 
 	if (bo->snoop && !bo->flush) {
 		DBG(("%s: handle=%d is snooped\n", __FUNCTION__, bo->handle));
-		assert(!bo->flush);
+		assert(bo->reusable);
 		assert(list_is_empty(&bo->list));
 		if (bo->exec == NULL && bo->rq && !__kgem_busy(kgem, bo->handle))
 			__kgem_bo_clear_busy(bo);
-		if (bo->rq == NULL) {
-			assert(!bo->needs_flush);
+		if (bo->rq == NULL)
 			kgem_bo_move_to_snoop(kgem, bo);
-		}
 		return;
 	}
 
diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/sna_accel.c xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/sna_accel.c
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/sna_accel.c	2013-03-13 19:36:07.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/sna_accel.c	2013-03-14 19:01:29.000000000 +0000
@@ -4463,6 +4463,7 @@
 							    box, n, COPY_LAST);
 
 				kgem_bo_sync__cpu(&sna->kgem, src_bo);
+				assert(src_bo->rq == NULL);
 				kgem_bo_destroy(&sna->kgem, src_bo);
 			}
 
@@ -13534,6 +13535,7 @@
 					    COPY_LAST);
 
 		kgem_bo_sync__cpu(&sna->kgem, dst_bo);
+		assert(dst_bo->rq == NULL);
 		kgem_bo_destroy(&sna->kgem, dst_bo);
 	}
 
diff -Nru xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/sna_display.c xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/sna_display.c
--- xserver-xorg-video-intel-2.21.4+git20130313.80401f4f/src/sna/sna_display.c	2013-03-13 19:36:07.000000000 +0000
+++ xserver-xorg-video-intel-2.21.4+git20130314.92023f39/src/sna/sna_display.c	2013-03-14 19:01:29.000000000 +0000
@@ -136,6 +136,7 @@
 
 	assert(bo->refcnt);
 	assert(bo->proxy == NULL);
+	assert(!bo->snoop);
 	if (bo->delta) {
 		DBG(("%s: reusing fb=%d for handle=%d\n",
 		     __FUNCTION__, bo->delta, bo->handle));