summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2009-12-16 19:05:38 +0100
committerDave Airlie <airlied@redhat.com>2010-01-11 14:41:05 +1000
commit69a18c328b762eaec3f8ca3af8c7cbf10b536bf8 (patch)
tree6dcda968d33a75acd649ba271eb27b689b685088 /drivers
parentc6af6053be60840dcbb037c3798557cbf71cbb08 (diff)
downloadblackbird-op-linux-69a18c328b762eaec3f8ca3af8c7cbf10b536bf8.tar.gz
blackbird-op-linux-69a18c328b762eaec3f8ca3af8c7cbf10b536bf8.zip
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')
-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 365fc6508173..73af53fe75a0 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