From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 28 Feb 2011 07:20:45 +0000 (+1000)
Subject: drm/nvc0: remove vm hack forcing large/small pages to not share a PDE
X-Git-Tag: v2.6.39-rc1~458^2~7^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b84f30e65c2352c6400b9c748b918ca4031f5d4a;p=~shefty%2Frdma-dev.git

drm/nvc0: remove vm hack forcing large/small pages to not share a PDE

Appears to be fixed with commit:

"drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo"

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
index 62824c80bcb..0059e6f58a8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vm.c
@@ -314,18 +314,7 @@ nouveau_vm_new(struct drm_device *dev, u64 offset, u64 length, u64 mm_offset,
 		vm->spg_shift = 12;
 		vm->lpg_shift = 17;
 		pgt_bits = 27;
-
-		/* Should be 4096 everywhere, this is a hack that's
-		 * currently necessary to avoid an elusive bug that
-		 * causes corruption when mixing small/large pages
-		 */
-		if (length < (1ULL << 40))
-			block = 4096;
-		else {
-			block = (1 << pgt_bits);
-			if (length < block)
-				block = length;
-		}
+		block = 4096;
 	} else {
 		kfree(vm);
 		return -ENOSYS;