commit 27f691a69d411b9b2093163cdd27780f9c927422
author Francisco Jerez <currojerez@riseup.net> Wed Dec 16 19:05:38 2009 +0100
committer Ben Skeggs <bskeggs@redhat.com> Mon Jan 11 09:06:31 2010 +1000
tree 7cd0a2f9998bf6ecb381d1678fa708b4e7a817e8
parent 77e2b5ed83864f0a58e2cd046b15aab6865babfb

drm/nouveau: No need to force evict=true when swapping evicted BOs back in.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>

drivers/gpu/drm/nouveau/nouveau_bo.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 365fc65..73af53f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -634,7 +634,7 @@
 	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;