From edfad9c8518d77832a8c1c3398b661fc691cb96d Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Fri, 29 Oct 2010 10:46:48 +0200
Subject: [PATCH] --- yaml --- r: 221783 b: refs/heads/master c:
 06fba6d4168069d818593e2fcc2d4bd0f888e97b h: refs/heads/master i:   221781:
 b0e7023e650df4c70f79a04655a4084694a67f98   221779:
 1f4c71abb12e7cfd4294d2e4f47f632b75d776ea   221775:
 ec5e4f06ab01f1599cce8cfae7087d6439015649 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e3411ef2a7c1..3c793523a77a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc4a5b83585e89a6bce650d32426f61c8d4bca5
+refs/heads/master: 06fba6d4168069d818593e2fcc2d4bd0f888e97b
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index f561eead057d..a32fe41e5e24 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -37,6 +37,7 @@
 #include <linux/mm.h>
 #include <linux/file.h>
 #include <linux/module.h>
+#include <asm/atomic.h>
 
 #define TTM_ASSERT_LOCKED(param)
 #define TTM_DEBUG(fmt, arg...)
@@ -444,6 +445,11 @@ static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo)
 	ttm_bo_mem_put(bo, &bo->mem);
 
 	atomic_set(&bo->reserved, 0);
+
+	/*
+	 * Make processes trying to reserve really pick it up.
+	 */
+	smp_mb__after_atomic_dec();
 	wake_up_all(&bo->event_queue);
 }