summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-02-28 10:20:45 +0300
committerBen Skeggs <bskeggs@redhat.com>2011-03-14 09:31:38 +0300
commitb84f30e65c2352c6400b9c748b918ca4031f5d4a (patch)
treec5b3b732756689d2d9ea0c4d38bc925b1dbf4a52 /drivers/gpu/drm/nouveau
parente73f88af66fcc50083fae4b7e1c39b469179a97a (diff)
downloadlinux-b84f30e65c2352c6400b9c748b918ca4031f5d4a.tar.xz
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_vm.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
index 62824c80bcb8..0059e6f58a8b 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;