drm/nouveau/nvif: give every mem object a human-readable identifier

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc.c b/drivers/gpu/drm/nouveau/dispnv50/crc.c
index 5fac476..4a43cca 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crc.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc.c
@@ -510,7 +510,7 @@ nv50_crc_ctx_init(struct nv50_head *head, struct nvif_mmu *mmu,
        struct nv50_core *core = nv50_disp(head->base.base.dev)->core;
        int ret;
 
-       ret = nvif_mem_init_map(mmu, NVIF_MEM_VRAM, len, &ctx->mem);
+       ret = nvif_mem_ctor_map(mmu, "kmsCrcNtfy", NVIF_MEM_VRAM, len, &ctx->mem);
        if (ret)
                return ret;
 
@@ -531,7 +531,7 @@ nv50_crc_ctx_init(struct nv50_head *head, struct nvif_mmu *mmu,
        return 0;
 
 fail_fini:
-       nvif_mem_fini(&ctx->mem);
+       nvif_mem_dtor(&ctx->mem);
        return ret;
 }
 
@@ -539,7 +539,7 @@ static inline void
 nv50_crc_ctx_fini(struct nv50_crc_notifier_ctx *ctx)
 {
        nvif_object_dtor(&ctx->ntfy);
-       nvif_mem_fini(&ctx->mem);
+       nvif_mem_dtor(&ctx->mem);
 }
 
 int nv50_crc_set_source(struct drm_crtc *crtc, const char *source_str)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 5bc40b5..f25daf4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -113,7 +113,7 @@ nv50_dmac_destroy(struct nv50_dmac *dmac)
 
        nv50_chan_destroy(&dmac->base);
 
-       nvif_mem_fini(&dmac->push);
+       nvif_mem_dtor(&dmac->push);
 }
 
 int
@@ -140,7 +140,8 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,
        if (device->info.family == NV_DEVICE_INFO_V0_PASCAL)
                type |= NVIF_MEM_VRAM;
 
-       ret = nvif_mem_init_map(&cli->mmu, type, 0x1000, &dmac->push);
+       ret = nvif_mem_ctor_map(&cli->mmu, "kmsChanPush", type, 0x1000,
+                               &dmac->push);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/lut.c b/drivers/gpu/drm/nouveau/dispnv50/lut.c
index 4e95ca5..6b2ad1e 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/lut.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/lut.c
@@ -60,7 +60,7 @@ nv50_lut_fini(struct nv50_lut *lut)
 {
        int i;
        for (i = 0; i < ARRAY_SIZE(lut->mem); i++)
-               nvif_mem_fini(&lut->mem[i]);
+               nvif_mem_dtor(&lut->mem[i]);
 }
 
 int
@@ -70,8 +70,8 @@ nv50_lut_init(struct nv50_disp *disp, struct nvif_mmu *mmu,
        const u32 size = disp->disp->object.oclass < GF110_DISP ? 257 : 1025;
        int i;
        for (i = 0; i < ARRAY_SIZE(lut->mem); i++) {
-               int ret = nvif_mem_init_map(mmu, NVIF_MEM_VRAM, size * 8,
-                                           &lut->mem[i]);
+               int ret = nvif_mem_ctor_map(mmu, "kmsLut", NVIF_MEM_VRAM,
+                                           size * 8, &lut->mem[i]);
                if (ret)
                        return ret;
        }

diff --git a/drivers/gpu/drm/nouveau/include/nvif/mem.h b/drivers/gpu/drm/nouveau/include/nvif/mem.h
index 80ee4ab..9e1071d 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/mem.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/mem.h
@@ -10,11 +10,13 @@ struct nvif_mem {
        u64 size;
 };
 
-int nvif_mem_init_type(struct nvif_mmu *mmu, s32 oclass, int type, u8 page,
-                      u64 size, void *argv, u32 argc, struct nvif_mem *);
-int nvif_mem_init(struct nvif_mmu *mmu, s32 oclass, u8 type, u8 page,
-                 u64 size, void *argv, u32 argc, struct nvif_mem *);
-void nvif_mem_fini(struct nvif_mem *);
+int nvif_mem_ctor_type(struct nvif_mmu *mmu, const char *name, s32 oclass,
+                      int type, u8 page, u64 size, void *argv, u32 argc,
+                      struct nvif_mem *);
+int nvif_mem_ctor(struct nvif_mmu *mmu, const char *name, s32 oclass, u8 type,
+                 u8 page, u64 size, void *argv, u32 argc, struct nvif_mem *);
+void nvif_mem_dtor(struct nvif_mem *);
 
-int nvif_mem_init_map(struct nvif_mmu *, u8 type, u64 size, struct nvif_mem *);
+int nvif_mem_ctor_map(struct nvif_mmu *, const char *name, u8 type, u64 size,
+                     struct nvif_mem *);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index c002f89..b1bb542 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -87,7 +87,7 @@ nouveau_mem_fini(struct nouveau_mem *mem)
        nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[1]);
        nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[0]);
        mutex_lock(&mem->cli->drm->master.lock);
-       nvif_mem_fini(&mem->mem);
+       nvif_mem_dtor(&mem->mem);
        mutex_unlock(&mem->cli->drm->master.lock);
 }
 
@@ -121,7 +121,7 @@ nouveau_mem_host(struct ttm_mem_reg *reg, struct ttm_dma_tt *tt)
 
        mutex_lock(&drm->master.lock);
        cli->base.super = true;
-       ret = nvif_mem_init_type(mmu, cli->mem->oclass, type, PAGE_SHIFT,
+       ret = nvif_mem_ctor_type(mmu, "ttmHostMem", cli->mem->oclass, type, PAGE_SHIFT,
                                 reg->num_pages << PAGE_SHIFT,
                                 &args, sizeof(args), &mem->mem);
        cli->base.super = super;
@@ -144,7 +144,7 @@ nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page)
        cli->base.super = true;
        switch (cli->mem->oclass) {
        case NVIF_CLASS_MEM_GF100:
-               ret = nvif_mem_init_type(mmu, cli->mem->oclass,
+               ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,
                                         drm->ttm.type_vram, page, size,
                                         &(struct gf100_mem_v0) {
                                                .contig = contig,
@@ -152,7 +152,7 @@ nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page)
                                         &mem->mem);
                break;
        case NVIF_CLASS_MEM_NV50:
-               ret = nvif_mem_init_type(mmu, cli->mem->oclass,
+               ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,
                                         drm->ttm.type_vram, page, size,
                                         &(struct nv50_mem_v0) {
                                                .bankswz = mmu->kind[mem->kind] == 2,

diff --git a/drivers/gpu/drm/nouveau/nvif/mem.c b/drivers/gpu/drm/nouveau/nvif/mem.c
index 5241d89..0e1b7b4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvif/mem.c
+++ b/drivers/gpu/drm/nouveau/nvif/mem.c
@@ -25,27 +25,29 @@
 #include <nvif/if000a.h>
 
 int
-nvif_mem_init_map(struct nvif_mmu *mmu, u8 type, u64 size, struct nvif_mem *mem)
+nvif_mem_ctor_map(struct nvif_mmu *mmu, const char *name, u8 type, u64 size,
+                 struct nvif_mem *mem)
 {
-       int ret = nvif_mem_init(mmu, mmu->mem, NVIF_MEM_MAPPABLE | type, 0,
-                               size, NULL, 0, mem);
+       int ret = nvif_mem_ctor(mmu, name, mmu->mem, NVIF_MEM_MAPPABLE | type,
+                               0, size, NULL, 0, mem);
        if (ret == 0) {
                ret = nvif_object_map(&mem->object, NULL, 0);
                if (ret)
-                       nvif_mem_fini(mem);
+                       nvif_mem_dtor(mem);
        }
        return ret;
 }
 
 void
-nvif_mem_fini(struct nvif_mem *mem)
+nvif_mem_dtor(struct nvif_mem *mem)
 {
        nvif_object_dtor(&mem->object);
 }
 
 int
-nvif_mem_init_type(struct nvif_mmu *mmu, s32 oclass, int type, u8 page,
-                  u64 size, void *argv, u32 argc, struct nvif_mem *mem)
+nvif_mem_ctor_type(struct nvif_mmu *mmu, const char *name, s32 oclass,
+                  int type, u8 page, u64 size, void *argv, u32 argc,
+                  struct nvif_mem *mem)
 {
        struct nvif_mem_v0 *args;
        u8 stack[128];
@@ -67,8 +69,8 @@ nvif_mem_init_type(struct nvif_mmu *mmu, s32 oclass, int type, u8 page,
        args->size = size;
        memcpy(args->data, argv, argc);
 
-       ret = nvif_object_ctor(&mmu->object, "nvifMem", 0, oclass, args,
-                              sizeof(*args) + argc, &mem->object);
+       ret = nvif_object_ctor(&mmu->object, name ? name : "nvifMem", 0, oclass,
+                              args, sizeof(*args) + argc, &mem->object);
        if (ret == 0) {
                mem->type = mmu->type[type].type;
                mem->page = args->page;
@@ -83,8 +85,8 @@ nvif_mem_init_type(struct nvif_mmu *mmu, s32 oclass, int type, u8 page,
 }
 
 int
-nvif_mem_init(struct nvif_mmu *mmu, s32 oclass, u8 type, u8 page,
-             u64 size, void *argv, u32 argc, struct nvif_mem *mem)
+nvif_mem_ctor(struct nvif_mmu *mmu, const char *name, s32 oclass, u8 type,
+             u8 page, u64 size, void *argv, u32 argc, struct nvif_mem *mem)
 {
        int ret = -EINVAL, i;
 
@@ -92,8 +94,8 @@ nvif_mem_init(struct nvif_mmu *mmu, s32 oclass, u8 type, u8 page,
 
        for (i = 0; ret && i < mmu->type_nr; i++) {
                if ((mmu->type[i].type & type) == type) {
-                       ret = nvif_mem_init_type(mmu, oclass, i, page, size,
-                                                argv, argc, mem);
+                       ret = nvif_mem_ctor_type(mmu, name, oclass, i, page,
+                                                size, argv, argc, mem);
                }
        }