diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-03-16 12:06:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-03-16 12:06:17 +1000 |
| commit | d4487b57a4594ffa1d28911706144329096a6de7 (patch) | |
| tree | 9ee36b3b9572e7e5034e32fff298a64b43c650c9 /drivers/gpu/drm/nouveau/nvkm | |
| parent | 67f1976665900c86989cfe99b884dc51bddfb0e9 (diff) | |
| parent | 9e75dc61eaa9acd1bff83c3b814ac2af6dc1f64c (diff) | |
Merge branch 'linux-4.16' of git://github.com/skeggsb/linux into drm-fixes
nouveau regression fixes.
* 'linux-4.16' of git://github.com/skeggsb/linux:
drm/nouveau/bl: fix backlight regression
drm/nouveau/bl: Fix oops on driver unbind
drm/nouveau/mmu: ALIGN_DOWN correct variable
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c index 93946dcee319..1c12e58f44c2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c @@ -1354,7 +1354,7 @@ nvkm_vmm_get_locked(struct nvkm_vmm *vmm, bool getref, bool mapref, bool sparse, tail = this->addr + this->size; if (vmm->func->page_block && next && next->page != p) - tail = ALIGN_DOWN(addr, vmm->func->page_block); + tail = ALIGN_DOWN(tail, vmm->func->page_block); if (addr <= tail && tail - addr >= size) { rb_erase(&this->tree, &vmm->free); |