---

yaml --- r: 179859 b: refs/heads/master c: 27f691a h: refs/heads/master i: 179857: 95de2e5 179855: a43c638 v: v3
git-mirror · Jan 10, 2010 · 1e17d08 · 1e17d08
1 parent acff708
commit 1e17d08
Show file tree

Hide file tree

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