From: Dave Airlie <[email protected]> This avoids constant need to ioremap when instobjs move at least on 64-bit systems.
Signed-off-by: Dave Airlie <[email protected]> --- .../drm/nouveau/nvkm/subdev/instmem/nv50.c | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c index 6fbaa1e5876d..929246bde72d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c @@ -30,10 +30,14 @@ #include <subdev/gsp.h> #include <subdev/mmu.h> +#include <linux/io-mapping.h> + struct nv50_instmem { struct nvkm_instmem base; u64 addr; + struct io_mapping iomap; + /* Mappings that can be evicted when BAR2 space has been exhausted. */ struct list_head lru; }; @@ -124,7 +128,6 @@ nv50_instobj_kmap(struct nv50_instobj *iobj, struct nvkm_vmm *vmm) struct nv50_instobj *eobj; struct nvkm_memory *memory = &iobj->base.memory; struct nvkm_subdev *subdev = &imem->base.subdev; - struct nvkm_device *device = subdev->device; struct nvkm_vma *bar = NULL, *ebar; u64 size = nvkm_memory_size(memory); void *emap; @@ -155,7 +158,7 @@ nv50_instobj_kmap(struct nv50_instobj *iobj, struct nvkm_vmm *vmm) mutex_unlock(&imem->base.mutex); if (!eobj) break; - iounmap(emap); + io_mapping_unmap(emap); nvkm_vmm_put(vmm, &ebar); } @@ -172,8 +175,7 @@ nv50_instobj_kmap(struct nv50_instobj *iobj, struct nvkm_vmm *vmm) /* Make the mapping visible to the host. */ iobj->bar = bar; - iobj->map = ioremap_wc(device->func->resource_addr(device, NVKM_BAR2_INST) + - (u32)iobj->bar->addr, size); + iobj->map = io_mapping_map_wc(&imem->iomap, iobj->bar->addr, size); if (!iobj->map) { nvkm_warn(subdev, "PRAMIN ioremap failed\n"); nvkm_vmm_put(vmm, &iobj->bar); @@ -330,7 +332,7 @@ nv50_instobj_dtor(struct nvkm_memory *memory) if (map) { struct nvkm_vmm *vmm = nvkm_bar_bar2_vmm(imem->subdev.device); - iounmap(map); + io_mapping_unmap(map); if (likely(vmm)) /* Can be NULL during BAR destructor. */ nvkm_vmm_put(vmm, &bar); } @@ -409,7 +411,10 @@ nv50_instmem_fini(struct nvkm_instmem *base) static void * nv50_instmem_dtor(struct nvkm_instmem *base) { - return nv50_instmem(base); + struct nv50_instmem *imem = nv50_instmem(base); + + io_mapping_fini(&imem->iomap); + return imem; } static const struct nvkm_instmem_func @@ -433,8 +438,16 @@ nv50_instmem_new_(const struct nvkm_instmem_func *func, if (!(imem = kzalloc_obj(*imem))) return -ENOMEM; + + if (!io_mapping_init_wc(&imem->iomap, device->func->resource_addr(device, NVKM_BAR2_INST), + device->func->resource_size(device, NVKM_BAR2_INST))) { + kfree(imem); + return -ENOMEM; + } + nvkm_instmem_ctor(func, device, type, inst, &imem->base); INIT_LIST_HEAD(&imem->lru); + *pimem = &imem->base; return 0; } -- 2.54.0
