drm/nouveau/nvif: give every vmm 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/include/nvif/vmm.h b/drivers/gpu/drm/nouveau/include/nvif/vmm.h
index 79bf85d2f43ad349b3636e6cfe6910a8b694a69b..a2ee92201ace46a18b5ab94d008a9efd84ea970c 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/vmm.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/vmm.h
@@ -30,9 +30,9 @@ struct nvif_vmm {
        int page_nr;
 };
 
-int nvif_vmm_init(struct nvif_mmu *, s32 oclass, bool managed, u64 addr,
-                 u64 size, void *argv, u32 argc, struct nvif_vmm *);
-void nvif_vmm_fini(struct nvif_vmm *);
+int nvif_vmm_ctor(struct nvif_mmu *, const char *name, s32 oclass, bool managed,
+                 u64 addr, u64 size, void *argv, u32 argc, struct nvif_vmm *);
+void nvif_vmm_dtor(struct nvif_vmm *);
 int nvif_vmm_get(struct nvif_vmm *, enum nvif_vmm_get, bool sparse,
                 u8 page, u8 align, u64 size, struct nvif_vma *);
 void nvif_vmm_put(struct nvif_vmm *, struct nvif_vma *);

diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c
index c1e773964eca8b7d1f3f411f481d9b911ae56124..6f65fa73e1cdf5f869dc1819fc6707073fad6a57 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_svm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_svm.c
@@ -347,7 +347,8 @@ nouveau_svmm_init(struct drm_device *dev, void *data,
         * All future channel/memory allocations will make use of this
         * VMM instead of the standard one.
         */
-       ret = nvif_vmm_init(&cli->mmu, cli->vmm.vmm.object.oclass, true,
+       ret = nvif_vmm_ctor(&cli->mmu, "svmVmm",
+                           cli->vmm.vmm.object.oclass, true,
                            args->unmanaged_addr, args->unmanaged_size,
                            &(struct gp100_vmm_v0) {
                                .fault_replay = true,

diff --git a/drivers/gpu/drm/nouveau/nouveau_vmm.c b/drivers/gpu/drm/nouveau/nouveau_vmm.c
index b28c7dc13ad6d083f7cbe0773f8d4a60186a838b..a49e88129c922ae4510a62e6b05815f6d878516f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_vmm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vmm.c
@@ -121,15 +121,15 @@ void
 nouveau_vmm_fini(struct nouveau_vmm *vmm)
 {
        nouveau_svmm_fini(&vmm->svmm);
-       nvif_vmm_fini(&vmm->vmm);
+       nvif_vmm_dtor(&vmm->vmm);
        vmm->cli = NULL;
 }
 
 int
 nouveau_vmm_init(struct nouveau_cli *cli, s32 oclass, struct nouveau_vmm *vmm)
 {
-       int ret = nvif_vmm_init(&cli->mmu, oclass, false, PAGE_SIZE, 0, NULL, 0,
-                               &vmm->vmm);
+       int ret = nvif_vmm_ctor(&cli->mmu, "drmVmm", oclass, false, PAGE_SIZE,
+                               0, NULL, 0, &vmm->vmm);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/nvif/vmm.c b/drivers/gpu/drm/nouveau/nvif/vmm.c
index dc82e5515fc5412c1bac6726e3439874e811050c..6053d6dc2184775e48ee5ea9dd02dd6dfe8a38e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvif/vmm.c
+++ b/drivers/gpu/drm/nouveau/nvif/vmm.c
@@ -105,15 +105,15 @@ nvif_vmm_get(struct nvif_vmm *vmm, enum nvif_vmm_get type, bool sparse,
 }
 
 void
-nvif_vmm_fini(struct nvif_vmm *vmm)
+nvif_vmm_dtor(struct nvif_vmm *vmm)
 {
        kfree(vmm->page);
        nvif_object_dtor(&vmm->object);
 }
 
 int
-nvif_vmm_init(struct nvif_mmu *mmu, s32 oclass, bool managed, u64 addr,
-             u64 size, void *argv, u32 argc, struct nvif_vmm *vmm)
+nvif_vmm_ctor(struct nvif_mmu *mmu, const char *name, s32 oclass, bool managed,
+             u64 addr, u64 size, void *argv, u32 argc, struct nvif_vmm *vmm)
 {
        struct nvif_vmm_v0 *args;
        u32 argn = sizeof(*args) + argc;
@@ -130,8 +130,8 @@ nvif_vmm_init(struct nvif_mmu *mmu, s32 oclass, bool managed, u64 addr,
        args->size = size;
        memcpy(args->data, argv, argc);
 
-       ret = nvif_object_ctor(&mmu->object, "nvifVmm", 0, oclass, args, argn,
-                              &vmm->object);
+       ret = nvif_object_ctor(&mmu->object, name ? name : "nvifVmm", 0,
+                              oclass, args, argn, &vmm->object);
        if (ret)
                goto done;
 
@@ -163,7 +163,7 @@ nvif_vmm_init(struct nvif_mmu *mmu, s32 oclass, bool managed, u64 addr,
 
 done:
        if (ret)
-               nvif_vmm_fini(vmm);
+               nvif_vmm_dtor(vmm);
        kfree(args);
        return ret;
 }