diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-14 05:53:42 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 05:53:42 -0700 |
| commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
| tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /drivers/gpu/drm/nouveau/nouveau_vm.c | |
| parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
| parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
| download | linux-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.gz linux-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.bz2 linux-b8ce9fb8e18af7466e0b915bb5979322cdace322.zip | |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_vm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vm.c | 1 |
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; } |