From c12b60b5094fe97db60cd0f18fafd1720679bd38 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 7 Apr 2008 13:05:51 +1000 Subject: nouveau: enable m2mf for tt<->vram moves, fix fence_poll --- linux-core/nouveau_bo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'linux-core/nouveau_bo.c') diff --git a/linux-core/nouveau_bo.c b/linux-core/nouveau_bo.c index 7a899769..fcda3037 100644 --- a/linux-core/nouveau_bo.c +++ b/linux-core/nouveau_bo.c @@ -259,12 +259,11 @@ nouveau_bo_move(struct drm_buffer_object *bo, int evict, int no_wait, return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } else { -// if (nouveau_bo_move_m2mf(bo, evict, no_wait, new_mem)) + if (nouveau_bo_move_m2mf(bo, evict, no_wait, new_mem)) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } if (0) { - nouveau_bo_move_m2mf(bo, 0, 0, NULL); nouveau_bo_move_gart(bo, 0, 0, NULL); } -- cgit v1.2.3