From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 16 Dec 2009 18:05:38 +0000 (+0100)
Subject: drm/nouveau: No need to force evict=true when swapping evicted BOs back in.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=69a18c328b762eaec3f8ca3af8c7cbf10b536bf8;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

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

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;