From 0cca832a2671c5cafcc09ee7ed49fb3ba6a90c25 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 25 Jul 2011 20:26:19 +1000
Subject: [PATCH] --- yaml --- r: 269663 b: refs/heads/master c:
 91a8f1ea4bd98a7de888f7d56e28b72cc0c63ca1 h: refs/heads/master i:   269661:
 4e310d4c26d770ebe3867f2b9bba263b26024771   269659:
 107663662fb2cb25dd7557177a97803f18ad368b   269655:
 3babe9053079e38492c302bfe9d74011c71acc32   269647:
 6effec7e3521992f6889ab285db543943fbe8cd4   269631:
 46338ca2154ea388e64b473864ea6cb5be06b208 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d4c6fc3fb1a..50c845396f67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afb0c796d8002a0052662ff337dbd18b5dc5ff97
+refs/heads/master: 91a8f1ea4bd98a7de888f7d56e28b72cc0c63ca1
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
index c919cfc8f2fd..81116cfea275 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -519,7 +519,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
 	if (USE_SEMA(dev) && dev_priv->chipset < 0x84) {
 		struct ttm_mem_reg *mem = &dev_priv->fence.bo->bo.mem;
 
-		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
+		ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_FROM_MEMORY,
 					     mem->start << PAGE_SHIFT,
 					     mem->size, NV_MEM_ACCESS_RW,
 					     NV_MEM_TARGET_VRAM, &obj);