drm/nvc0: remove vm hack forcing large/small pages to not share a PDE
authorBen Skeggs <bskeggs@redhat.com>
Mon, 28 Feb 2011 07:20:45 +0000 (17:20 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2011 06:31:38 +0000 (16:31 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_vm.c

index 62824c80bcb8f17e2c15efcd93b3668a75f135f1..0059e6f58a8b642c9d88f00b7991a97dc68b1772 100644 (file)
@@ -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;