drm/nouveau: No need to force evict=true when swapping evicted BOs back in.
authorFrancisco Jerez <currojerez@riseup.net>
Wed, 16 Dec 2009 18:05:38 +0000 (19:05 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 11 Jan 2010 04:41:05 +0000 (14:41 +1000)
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
drivers/gpu/drm/nouveau/nouveau_bo.c

index 365fc65081733d1db52c87387f703a9782da0a11..73af53fe75a05263a7d62d04813444a7ca64c330 100644 (file)
@@ -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;