---

yaml --- r: 334727 b: refs/heads/master c: 7bc17a7 h: refs/heads/master i: 334725: 08082c0 334723: 8fe4662 334719: f093f31 v: v3
git-mirror · Oct 23, 2012 · ba78b7e · ba78b7e
1 parent 20d4f31
commit ba78b7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a16d4f86019a72b3e8cbb89abff769b25b53ab69
+refs/heads/master: 7bc17a7837bf4ec8fd2d63438c0b6b0160c454c1
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -817,11 +817,11 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
 		goto retry;
 	}
 
-	ret = ttm_bo_reserve_locked(bo, false, no_wait_reserve, false, 0);
+	ret = ttm_bo_reserve_locked(bo, false, true, false, 0);
 
 	if (unlikely(ret == -EBUSY)) {
 		spin_unlock(&glob->lru_lock);
-		if (likely(!no_wait_gpu))
+		if (likely(!no_wait_reserve))
 			ret = ttm_bo_wait_unreserved(bo, interruptible);
 
 		kref_put(&bo->list_kref, ttm_bo_release_list);