From 1e17d08e00779ac9eeea872d190d623a5295e5bf Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 16 Dec 2009 19:05:38 +0100
Subject: [PATCH] --- yaml --- r: 179859 b: refs/heads/master c:
 27f691a69d411b9b2093163cdd27780f9c927422 h: refs/heads/master i:   179857:
 95de2e54a310602251c10e9947d2d6feeed9ca4d   179855:
 a43c63849285dd0bddb3dbb05c3c8a040a0a792f v: v3

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

diff --git a/[refs] b/[refs]
index 02c0e391da07..f6e2bcba8f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77e2b5ed83864f0a58e2cd046b15aab6865babfb
+refs/heads/master: 27f691a69d411b9b2093163cdd27780f9c927422
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
index 365fc6508173..73af53fe75a0 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -634,7 +634,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
 	if (ret)
 		goto out;
 
-	ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait, new_mem);
+	ret = nouveau_bo_move_m2mf(bo, evict, intr, no_wait, new_mem);
 	if (ret)
 		goto out;