From: Ben Skeggs <skeggsb@gmail.com>
Date: Sun, 23 Mar 2008 16:22:42 +0000 (+1100)
Subject: nouveau: silence warning
X-Git-Tag: submit/1.0/20121108.012404~927
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a244d2905052d3263bdcc26b295558a354702b89;p=profile%2Fivi%2Flibdrm.git

nouveau: silence warning
---

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index defbe43..f012262 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -23,7 +23,7 @@ i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \
 		i915_buffer.o i915_compat.o i915_execbuf.o
 nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
 		nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \
-		nouveau_sgdma.o nouveau_dma.o nouveau_buffer.o nouveau_fence.o \
+		nouveau_sgdma.o nouveau_dma.o nouveau_bo.o nouveau_fence.o \
 		nv04_timer.o \
 		nv04_mc.o nv40_mc.o nv50_mc.o \
 		nv04_fb.o nv10_fb.o nv40_fb.o \
diff --git a/linux-core/nouveau_buffer.c b/linux-core/nouveau_bo.c
similarity index 98%
rename from linux-core/nouveau_buffer.c
rename to linux-core/nouveau_bo.c
index 1154931..7a89976 100644
--- a/linux-core/nouveau_buffer.c
+++ b/linux-core/nouveau_bo.c
@@ -262,6 +262,12 @@ nouveau_bo_move(struct drm_buffer_object *bo, int evict, int no_wait,
 //		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);
+	}
+
 	return 0;
 }