From: Francisco Jerez <currojerez@riseup.net>
Date: Fri, 11 Dec 2009 17:40:17 +0000 (+0100)
Subject: drm/nouveau: Fix up buffer eviction, and evict them to GART, if possible.
X-Git-Tag: v3.0~6071^2~58^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=22fbd53809eb7a1b00fe09159fe0a565fb6c725c;p=platform%2Fkernel%2Flinux-amlogic.git

drm/nouveau: Fix up buffer eviction, and evict them to GART, if possible.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index aa2dfbc..e9f0190 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -400,10 +400,16 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 	struct nouveau_bo *nvbo = nouveau_bo(bo);
 
 	switch (bo->mem.mem_type) {
+	case TTM_PL_VRAM:
+		nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_TT |
+					 TTM_PL_FLAG_SYSTEM);
+		break;
 	default:
 		nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_SYSTEM);
 		break;
 	}
+
+	*pl = nvbo->placement;
 }