]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/nouveau/mmu: define user interfaces to mmu memory allocation
authorBen Skeggs <bskeggs@redhat.com>
Tue, 31 Oct 2017 17:56:19 +0000 (03:56 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 2 Nov 2017 03:32:31 +0000 (13:32 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
12 files changed:
drivers/gpu/drm/nouveau/include/nvif/if000a.h
drivers/gpu/drm/nouveau/include/nvif/mem.h [new file with mode: 0644]
drivers/gpu/drm/nouveau/include/nvkm/core/client.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
drivers/gpu/drm/nouveau/nvif/Kbuild
drivers/gpu/drm/nouveau/nvif/mem.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/core/client.c
drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/ummu.c

index e6e8764abf4a896525df56f3770028a0f775c763..88d0938fbd5ae84ba66067f1c416947e4a81a4b9 100644 (file)
@@ -1,5 +1,14 @@
 #ifndef __NVIF_IF000A_H__
 #define __NVIF_IF000A_H__
+struct nvif_mem_v0 {
+       __u8  version;
+       __u8  type;
+       __u8  page;
+       __u8  pad03[5];
+       __u64 size;
+       __u64 addr;
+       __u8  data[];
+};
 
 struct nvif_mem_ram_vn {
 };
diff --git a/drivers/gpu/drm/nouveau/include/nvif/mem.h b/drivers/gpu/drm/nouveau/include/nvif/mem.h
new file mode 100644 (file)
index 0000000..b542fe3
--- /dev/null
@@ -0,0 +1,18 @@
+#ifndef __NVIF_MEM_H__
+#define __NVIF_MEM_H__
+#include "mmu.h"
+
+struct nvif_mem {
+       struct nvif_object object;
+       u8  type;
+       u8  page;
+       u64 addr;
+       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 *);
+#endif
index e876634da10a18a377c3565046f7ddd75295d8ca..fa58efb0d42aff3bba8473639d9054e41236667f 100644 (file)
@@ -17,6 +17,9 @@ struct nvkm_client {
        int (*ntfy)(const void *, u32, const void *, u32);
 
        struct nvkm_vm *vm;
+
+       struct list_head umem;
+       spinlock_t lock;
 };
 
 int  nvkm_client_new(const char *name, u64 device, const char *cfg,
index c58394baeb7ca8d6bddd475b30fb3e1af58e6c3b..0de5f8b7096a149844fae6462a14411e1fbab3ff 100644 (file)
@@ -98,6 +98,7 @@ int nvkm_vmm_map(struct nvkm_vmm *, struct nvkm_vma *, void *argv, u32 argc,
                 struct nvkm_vmm_map *);
 void nvkm_vmm_unmap(struct nvkm_vmm *, struct nvkm_vma *);
 
+struct nvkm_memory *nvkm_umem_search(struct nvkm_client *, u64);
 struct nvkm_vmm *nvkm_uvmm_search(struct nvkm_client *, u64 handle);
 
 struct nvkm_mmu {
index 1f23a08cf70108bd884e6c8fe2aaffbdd6c4232f..2e0a90b4dda86925581fa874dd1f169f04867bfe 100644 (file)
@@ -2,5 +2,6 @@ nvif-y := nvif/object.o
 nvif-y += nvif/client.o
 nvif-y += nvif/device.o
 nvif-y += nvif/driver.o
+nvif-y += nvif/mem.o
 nvif-y += nvif/mmu.o
 nvif-y += nvif/notify.o
diff --git a/drivers/gpu/drm/nouveau/nvif/mem.c b/drivers/gpu/drm/nouveau/nvif/mem.c
new file mode 100644 (file)
index 0000000..0f9382c
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2017 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <nvif/mem.h>
+#include <nvif/client.h>
+
+#include <nvif/if000a.h>
+
+void
+nvif_mem_fini(struct nvif_mem *mem)
+{
+       nvif_object_fini(&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)
+{
+       struct nvif_mem_v0 *args;
+       u8 stack[128];
+       int ret;
+
+       mem->object.client = NULL;
+       if (type < 0)
+               return -EINVAL;
+
+       if (sizeof(*args) + argc > sizeof(stack)) {
+               if (!(args = kmalloc(sizeof(*args) + argc, GFP_KERNEL)))
+                       return -ENOMEM;
+       } else {
+               args = (void *)stack;
+       }
+       args->version = 0;
+       args->type = type;
+       args->page = page;
+       args->size = size;
+       memcpy(args->data, argv, argc);
+
+       ret = nvif_object_init(&mmu->object, 0, oclass, args,
+                              sizeof(*args) + argc, &mem->object);
+       if (ret == 0) {
+               mem->type = mmu->type[type].type;
+               mem->page = args->page;
+               mem->addr = args->addr;
+               mem->size = args->size;
+       }
+
+       if (args != (void *)stack)
+               kfree(args);
+       return ret;
+
+}
+
+int
+nvif_mem_init(struct nvif_mmu *mmu, s32 oclass, u8 type, u8 page,
+             u64 size, void *argv, u32 argc, struct nvif_mem *mem)
+{
+       int ret = -EINVAL, i;
+
+       mem->object.client = NULL;
+
+       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);
+               }
+       }
+
+       return ret;
+}
index 0d3a896892b4bc4ea6f55503a5d35413505906e3..ac671202919e885fd8b19957f63c6f6217786b2e 100644 (file)
@@ -301,5 +301,7 @@ nvkm_client_new(const char *name, u64 device, const char *cfg,
        client->debug = nvkm_dbgopt(dbg, "CLIENT");
        client->objroot = RB_ROOT;
        client->ntfy = ntfy;
+       INIT_LIST_HEAD(&client->umem);
+       spin_lock_init(&client->lock);
        return 0;
 }
index a28018ee5b197b26cee1b07b72956248af47c0a0..d777df5a64e6c08efa4481a7f772290b978953d2 100644 (file)
@@ -53,7 +53,7 @@ nvkm_ioctl_sclass(struct nvkm_client *client,
        union {
                struct nvif_ioctl_sclass_v0 v0;
        } *args = data;
-       struct nvkm_oclass oclass;
+       struct nvkm_oclass oclass = { .client = client };
        int ret = -ENOSYS, i = 0;
 
        nvif_ioctl(object, "sclass size %d\n", size);
index 0c2fa272721f48207e1f3a6910b1b5432ab1284d..34f5aae8f3a11c1bb05f43f830a566a2ff4ae06b 100644 (file)
@@ -30,4 +30,5 @@ nvkm-y += nvkm/subdev/mmu/vmmgm20b.o
 nvkm-y += nvkm/subdev/mmu/vmmgp100.o
 nvkm-y += nvkm/subdev/mmu/vmmgp10b.o
 
+nvkm-y += nvkm/subdev/mmu/umem.o
 nvkm-y += nvkm/subdev/mmu/ummu.o
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.c
new file mode 100644 (file)
index 0000000..fac2f9a
--- /dev/null
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2017 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "umem.h"
+#include "ummu.h"
+
+#include <core/client.h>
+#include <core/memory.h>
+#include <subdev/bar.h>
+
+#include <nvif/class.h>
+#include <nvif/if000a.h>
+#include <nvif/unpack.h>
+
+static const struct nvkm_object_func nvkm_umem;
+struct nvkm_memory *
+nvkm_umem_search(struct nvkm_client *client, u64 handle)
+{
+       struct nvkm_client *master = client->object.client;
+       struct nvkm_memory *memory = NULL;
+       struct nvkm_object *object;
+       struct nvkm_umem *umem;
+
+       object = nvkm_object_search(client, handle, &nvkm_umem);
+       if (IS_ERR(object)) {
+               if (client->super && client != master) {
+                       spin_lock(&master->lock);
+                       list_for_each_entry(umem, &master->umem, head) {
+                               if (umem->object.object == handle) {
+                                       memory = nvkm_memory_ref(umem->memory);
+                                       break;
+                               }
+                       }
+                       spin_unlock(&master->lock);
+               }
+       } else {
+               umem = nvkm_umem(object);
+               if (!umem->priv || client->super)
+                       memory = nvkm_memory_ref(umem->memory);
+       }
+
+       return memory ? memory : ERR_PTR(-ENOENT);
+}
+
+static int
+nvkm_umem_unmap(struct nvkm_object *object)
+{
+       struct nvkm_umem *umem = nvkm_umem(object);
+
+       if (!umem->map)
+               return -EEXIST;
+
+       if (umem->io) {
+               if (!IS_ERR(umem->bar)) {
+                       struct nvkm_device *device = umem->mmu->subdev.device;
+                       nvkm_vmm_put(nvkm_bar_bar1_vmm(device), &umem->bar);
+               } else {
+                       umem->bar = NULL;
+               }
+       } else {
+               vunmap(umem->map);
+               umem->map = NULL;
+       }
+
+       return 0;
+}
+
+static int
+nvkm_umem_map(struct nvkm_object *object, void *argv, u32 argc,
+             enum nvkm_object_map *type, u64 *handle, u64 *length)
+{
+       struct nvkm_umem *umem = nvkm_umem(object);
+       struct nvkm_mmu *mmu = umem->mmu;
+
+       if (!umem->mappable)
+               return -EINVAL;
+       if (umem->map)
+               return -EEXIST;
+
+       if ((umem->type & NVKM_MEM_HOST) && !argc) {
+               int ret = nvkm_mem_map_host(umem->memory, &umem->map);
+               if (ret)
+                       return ret;
+
+               *handle = (unsigned long)(void *)umem->map;
+               *length = nvkm_memory_size(umem->memory);
+               *type = NVKM_OBJECT_MAP_VA;
+               return 0;
+       } else
+       if ((umem->type & NVKM_MEM_VRAM) ||
+           (umem->type & NVKM_MEM_KIND)) {
+               int ret = mmu->func->mem.umap(mmu, umem->memory, argv, argc,
+                                             handle, length, &umem->bar);
+               if (ret)
+                       return ret;
+
+               *type = NVKM_OBJECT_MAP_IO;
+       } else {
+               return -EINVAL;
+       }
+
+       umem->io = (*type == NVKM_OBJECT_MAP_IO);
+       return 0;
+}
+
+static void *
+nvkm_umem_dtor(struct nvkm_object *object)
+{
+       struct nvkm_umem *umem = nvkm_umem(object);
+       spin_lock(&umem->object.client->lock);
+       list_del_init(&umem->head);
+       spin_unlock(&umem->object.client->lock);
+       nvkm_memory_unref(&umem->memory);
+       return umem;
+}
+
+static const struct nvkm_object_func
+nvkm_umem = {
+       .dtor = nvkm_umem_dtor,
+       .map = nvkm_umem_map,
+       .unmap = nvkm_umem_unmap,
+};
+
+int
+nvkm_umem_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
+             struct nvkm_object **pobject)
+{
+       struct nvkm_mmu *mmu = nvkm_ummu(oclass->parent)->mmu;
+       union {
+               struct nvif_mem_v0 v0;
+       } *args = argv;
+       struct nvkm_umem *umem;
+       int type, ret = -ENOSYS;
+       u8  page;
+       u64 size;
+
+       if (!(ret = nvif_unpack(ret, &argv, &argc, args->v0, 0, 0, true))) {
+               type = args->v0.type;
+               page = args->v0.page;
+               size = args->v0.size;
+       } else
+               return ret;
+
+       if (type >= mmu->type_nr)
+               return -EINVAL;
+
+       if (!(umem = kzalloc(sizeof(*umem), GFP_KERNEL)))
+               return -ENOMEM;
+       nvkm_object_ctor(&nvkm_umem, oclass, &umem->object);
+       umem->mmu = mmu;
+       umem->type = mmu->type[type].type;
+       umem->priv = oclass->client->super;
+       INIT_LIST_HEAD(&umem->head);
+       *pobject = &umem->object;
+
+       if (mmu->type[type].type & NVKM_MEM_MAPPABLE) {
+               page = max_t(u8, page, PAGE_SHIFT);
+               umem->mappable = true;
+       }
+
+       ret = nvkm_mem_new_type(mmu, type, page, size, argv, argc,
+                               &umem->memory);
+       if (ret)
+               return ret;
+
+       spin_lock(&umem->object.client->lock);
+       list_add(&umem->head, &umem->object.client->umem);
+       spin_unlock(&umem->object.client->lock);
+
+       args->v0.page = nvkm_memory_page(umem->memory);
+       args->v0.addr = nvkm_memory_addr(umem->memory);
+       args->v0.size = nvkm_memory_size(umem->memory);
+       return 0;
+}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/umem.h
new file mode 100644 (file)
index 0000000..85cf692
--- /dev/null
@@ -0,0 +1,26 @@
+#ifndef __NVKM_UMEM_H__
+#define __NVKM_UMEM_H__
+#define nvkm_umem(p) container_of((p), struct nvkm_umem, object)
+#include <core/object.h>
+#include "mem.h"
+
+struct nvkm_umem {
+       struct nvkm_object object;
+       struct nvkm_mmu *mmu;
+       u8 type:8;
+       bool priv:1;
+       bool mappable:1;
+       bool io:1;
+
+       struct nvkm_memory *memory;
+       struct list_head head;
+
+       union {
+               struct nvkm_vma *bar;
+               void *map;
+       };
+};
+
+int nvkm_umem_new(const struct nvkm_oclass *, void *argv, u32 argc,
+                 struct nvkm_object **);
+#endif
index eba03d6c7b649ee651378950997a86e14a8a66f4..ed192ab3728b7a46826d8a6a7c4ca1ee1320670a 100644 (file)
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "ummu.h"
+#include "umem.h"
+
+#include <core/client.h>
 
 #include <nvif/if0008.h>
 #include <nvif/unpack.h>
 
+static int
+nvkm_ummu_sclass(struct nvkm_object *object, int index,
+                struct nvkm_oclass *oclass)
+{
+       struct nvkm_mmu *mmu = nvkm_ummu(object)->mmu;
+
+       if (mmu->func->mem.user.oclass && oclass->client->super) {
+               if (index-- == 0) {
+                       oclass->base = mmu->func->mem.user;
+                       oclass->ctor = nvkm_umem_new;
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
 static int
 nvkm_ummu_heap(struct nvkm_ummu *ummu, void *argv, u32 argc)
 {
@@ -115,6 +135,7 @@ nvkm_ummu_mthd(struct nvkm_object *object, u32 mthd, void *argv, u32 argc)
 static const struct nvkm_object_func
 nvkm_ummu = {
        .mthd = nvkm_ummu_mthd,
+       .sclass = nvkm_ummu_sclass,
 };
 
 int