Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6497c2ba authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mmu: swap out round for ALIGN 



Rounding value is guaranteed to be power-of-two, so this is better
anyway.

Fixes build on 32-bit.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 46bda4f4

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

+2 −2
Original line number Diff line number Diff line
@@ -1349,12 +1349,12 @@ nvkm_vmm_get_locked(struct nvkm_vmm *vmm, bool getref, bool mapref, bool sparse, 


		addr = this->addr;

		if (vmm->func->page_block && prev && prev->page != p)

			addr = roundup(addr, vmm->func->page_block);

			addr = ALIGN(addr, vmm->func->page_block);

		addr = ALIGN(addr, 1ULL << align);



		tail = this->addr + this->size;

		if (vmm->func->page_block && next && next->page != p)

			tail = rounddown(tail, vmm->func->page_block);

			tail = ALIGN_DOWN(addr, vmm->func->page_block);



		if (addr <= tail && tail - addr >= size) {

			rb_erase(&this->tree, &vmm->free);