From ec1583051f5500bf9a11eda5e1a10a32808a7ef6 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Sat, 28 May 2011 02:12:04 +1000
Subject: [PATCH] --- yaml --- r: 253212 b: refs/heads/master c:
 73c337e70e75bb94dcb21459dd06afad0746634c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b9fa9ebd2d4d..c60c5232878d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1003d9c90f410777ab57f675b2a575c9c7ab5d7
+refs/heads/master: 73c337e70e75bb94dcb21459dd06afad0746634c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_vm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_vm.c
index 0059e6f58a8b..519a6b4bba46 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_vm.c
@@ -58,6 +58,7 @@ nouveau_vm_map_at(struct nouveau_vma *vma, u64 delta, struct nouveau_mem *node)
 			num -= len;
 			pte += len;
 			if (unlikely(end >= max)) {
+				phys += len << (bits + 12);
 				pde++;
 				pte = 0;
 			}