aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorGravatar Ben Skeggs <bskeggs@redhat.com> 2011-05-28 02:12:04 +1000
committerGravatar Ben Skeggs <bskeggs@redhat.com> 2011-06-07 09:22:48 +1000
commit73c337e70e75bb94dcb21459dd06afad0746634c (patch)
tree704d89b8e2ff3abd3bb66860ecc62011a512feb7 /drivers/gpu
parentdrm/nv17-nv40: Fix modesetting failure when pitch == 4096px (fdo bug 35901). (diff)
downloadlinux-73c337e70e75bb94dcb21459dd06afad0746634c.tar.gz
linux-73c337e70e75bb94dcb21459dd06afad0746634c.tar.bz2
linux-73c337e70e75bb94dcb21459dd06afad0746634c.zip
drm/nouveau: fix vram page mapping when crossing page table boundaries
Hopefully the cause of nvc0 "page jumping" issue. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_vm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
index 0059e6f58a8b..519a6b4bba46 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/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;
}