Commit 3a314f74 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: remove explicit unmaps 



If the VMA is being deleted, we don't need to explicity unmap first
anymore.  The MMU code will automatically merge the operations into
a single page tree walk.

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

drivers/gpu/drm/nouveau/nouveau_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -1414,7 +1414,6 @@ nouveau_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *reg) 
	if (!mem->bar_vma.node)

		return;



	nvkm_vm_unmap(&mem->bar_vma);

	nvkm_vm_put(&mem->bar_vma);

}

drivers/gpu/drm/nouveau/nouveau_mem.c

+2 −8
Original line number Diff line number Diff line
@@ -36,15 +36,9 @@ nouveau_mem_map(struct nouveau_mem *mem, 
void

nouveau_mem_fini(struct nouveau_mem *mem)

{

	if (mem->vma[1].node) {

		nvkm_vm_unmap(&mem->vma[1]);

	nvkm_vm_put(&mem->vma[1]);

	}

	if (mem->vma[0].node) {

		nvkm_vm_unmap(&mem->vma[0]);

	nvkm_vm_put(&mem->vma[0]);

}

}



int

nouveau_mem_host(struct ttm_mem_reg *reg, struct ttm_dma_tt *tt)

drivers/gpu/drm/nouveau/nouveau_vmm.c

+1 −3
Original line number Diff line number Diff line
@@ -61,10 +61,8 @@ nouveau_vma_del(struct nouveau_vma **pvma) 
{

	struct nouveau_vma *vma = *pvma;

	if (vma && --vma->refs <= 0) {

		if (likely(vma->addr != ~0ULL)) {

			nouveau_vma_unmap(vma);

		if (likely(vma->addr != ~0ULL))

			nvkm_vm_put(&vma->_vma);

		}

		list_del(&vma->head);

		*pvma = NULL;

		kfree(*pvma);

CRA Git | Maintained and supported by SUSTech CRA and CCSE