summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2009-12-16 19:05:38 +0100
committerBen Skeggs <bskeggs@redhat.com>2010-01-11 09:06:31 +1000
commit27f691a69d411b9b2093163cdd27780f9c927422 (patch)
tree7cd0a2f9998bf6ecb381d1678fa708b4e7a817e8 /drivers/gpu
parent77e2b5ed83864f0a58e2cd046b15aab6865babfb (diff)
downloadop-kernel-dev-27f691a69d411b9b2093163cdd27780f9c927422.zip
op-kernel-dev-27f691a69d411b9b2093163cdd27780f9c927422.tar.gz
drm/nouveau: No need to force evict=true when swapping evicted BOs back in.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c2
1 files changed, 1 insertions, 1 deletions
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 @@ 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;
OpenPOWER on IntegriCloud