diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-28 02:20:45 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-03-14 02:31:38 -0400 |
commit | b84f30e65c2352c6400b9c748b918ca4031f5d4a (patch) | |
tree | c5b3b732756689d2d9ea0c4d38bc925b1dbf4a52 /drivers/gpu/drm/nouveau/nouveau_vm.c | |
parent | e73f88af66fcc50083fae4b7e1c39b469179a97a (diff) |
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/nouveau_vm.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vm.c | 13 |
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, | |||
314 | vm->spg_shift = 12; | 314 | vm->spg_shift = 12; |
315 | vm->lpg_shift = 17; | 315 | vm->lpg_shift = 17; |
316 | pgt_bits = 27; | 316 | pgt_bits = 27; |
317 | 317 | block = 4096; | |
318 | /* Should be 4096 everywhere, this is a hack that's | ||
319 | * currently necessary to avoid an elusive bug that | ||
320 | * causes corruption when mixing small/large pages | ||
321 | */ | ||
322 | if (length < (1ULL << 40)) | ||
323 | block = 4096; | ||
324 | else { | ||
325 | block = (1 << pgt_bits); | ||
326 | if (length < block) | ||
327 | block = length; | ||
328 | } | ||
329 | } else { | 318 | } else { |
330 | kfree(vm); | 319 | kfree(vm); |
331 | return -ENOSYS; | 320 | return -ENOSYS; |