drm/ttm: rename bo manager to range manager.
authorDave Airlie <airlied@redhat.com>
Tue, 4 Aug 2020 02:56:30 +0000 (12:56 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 6 Aug 2020 03:12:40 +0000 (13:12 +1000)
The generic manager is called the range manager now, rename
the file and some internals.

Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-58-airlied@gmail.com
drivers/gpu/drm/ttm/Makefile
drivers/gpu/drm/ttm/ttm_bo_manager.c [deleted file]
drivers/gpu/drm/ttm/ttm_range_manager.c [new file with mode: 0644]

index caea2a0994966a7aa42f77c4f38fe0db11eaf6a3..e54326e6cea4a5cc1c1977cd94d5197fd48ace72 100644 (file)
@@ -4,7 +4,7 @@
 
 ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \
        ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
-       ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o
+       ttm_execbuf_util.o ttm_page_alloc.o ttm_range_manager.o
 ttm-$(CONFIG_AGP) += ttm_agp_backend.o
 ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o
 
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
deleted file mode 100644 (file)
index 6679dc1..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-/**************************************************************************
- *
- * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA
- * All Rights Reserved.
- *
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-/*
- * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
- */
-
-#include <drm/ttm/ttm_module.h>
-#include <drm/ttm/ttm_bo_driver.h>
-#include <drm/ttm/ttm_placement.h>
-#include <drm/drm_mm.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-
-/**
- * Currently we use a spinlock for the lock, but a mutex *may* be
- * more appropriate to reduce scheduling latency if the range manager
- * ends up with very fragmented allocation patterns.
- */
-
-struct ttm_range_manager {
-       struct ttm_mem_type_manager manager;
-       struct drm_mm mm;
-       spinlock_t lock;
-};
-
-static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_manager *man)
-{
-       return container_of(man, struct ttm_range_manager, manager);
-}
-
-static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
-                              struct ttm_buffer_object *bo,
-                              const struct ttm_place *place,
-                              struct ttm_mem_reg *mem)
-{
-       struct ttm_range_manager *rman = to_range_manager(man);
-       struct drm_mm *mm = &rman->mm;
-       struct drm_mm_node *node;
-       enum drm_mm_insert_mode mode;
-       unsigned long lpfn;
-       int ret;
-
-       lpfn = place->lpfn;
-       if (!lpfn)
-               lpfn = man->size;
-
-       node = kzalloc(sizeof(*node), GFP_KERNEL);
-       if (!node)
-               return -ENOMEM;
-
-       mode = DRM_MM_INSERT_BEST;
-       if (place->flags & TTM_PL_FLAG_TOPDOWN)
-               mode = DRM_MM_INSERT_HIGH;
-
-       spin_lock(&rman->lock);
-       ret = drm_mm_insert_node_in_range(mm, node,
-                                         mem->num_pages,
-                                         mem->page_alignment, 0,
-                                         place->fpfn, lpfn, mode);
-       spin_unlock(&rman->lock);
-
-       if (unlikely(ret)) {
-               kfree(node);
-       } else {
-               mem->mm_node = node;
-               mem->start = node->start;
-       }
-
-       return ret;
-}
-
-static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
-                               struct ttm_mem_reg *mem)
-{
-       struct ttm_range_manager *rman = to_range_manager(man);
-
-       if (mem->mm_node) {
-               spin_lock(&rman->lock);
-               drm_mm_remove_node(mem->mm_node);
-               spin_unlock(&rman->lock);
-
-               kfree(mem->mm_node);
-               mem->mm_node = NULL;
-       }
-}
-
-static const struct ttm_mem_type_manager_func ttm_bo_manager_func;
-
-int ttm_range_man_init(struct ttm_bo_device *bdev,
-                      unsigned type,
-                      uint32_t available_caching,
-                      uint32_t default_caching,
-                      bool use_tt,
-                      unsigned long p_size)
-{
-       struct ttm_mem_type_manager *man;
-       struct ttm_range_manager *rman;
-
-       rman = kzalloc(sizeof(*rman), GFP_KERNEL);
-       if (!rman)
-               return -ENOMEM;
-
-       man = &rman->manager;
-       man->available_caching = available_caching;
-       man->default_caching = default_caching;
-       man->use_tt = use_tt;
-
-       man->func = &ttm_bo_manager_func;
-
-       ttm_mem_type_manager_init(man, p_size);
-
-       drm_mm_init(&rman->mm, 0, p_size);
-       spin_lock_init(&rman->lock);
-
-       ttm_set_driver_manager(bdev, type, &rman->manager);
-       ttm_mem_type_manager_set_used(man, true);
-       return 0;
-}
-EXPORT_SYMBOL(ttm_range_man_init);
-
-int ttm_range_man_fini(struct ttm_bo_device *bdev,
-                      unsigned type)
-{
-       struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
-       struct ttm_range_manager *rman = to_range_manager(man);
-       struct drm_mm *mm = &rman->mm;
-       int ret;
-
-       ttm_mem_type_manager_set_used(man, false);
-
-       ret = ttm_mem_type_manager_force_list_clean(bdev, man);
-       if (ret)
-               return ret;
-
-       spin_lock(&rman->lock);
-       drm_mm_clean(mm);
-       drm_mm_takedown(mm);
-       spin_unlock(&rman->lock);
-
-       ttm_mem_type_manager_cleanup(man);
-       ttm_set_driver_manager(bdev, type, NULL);
-       kfree(rman);
-       return 0;
-}
-EXPORT_SYMBOL(ttm_range_man_fini);
-
-static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
-                            struct drm_printer *printer)
-{
-       struct ttm_range_manager *rman = to_range_manager(man);
-
-       spin_lock(&rman->lock);
-       drm_mm_print(&rman->mm, printer);
-       spin_unlock(&rman->lock);
-}
-
-static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
-       .get_node = ttm_bo_man_get_node,
-       .put_node = ttm_bo_man_put_node,
-       .debug = ttm_bo_man_debug
-};
diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c
new file mode 100644 (file)
index 0000000..7fddc74
--- /dev/null
@@ -0,0 +1,187 @@
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/**************************************************************************
+ *
+ * Copyright (c) 2007-2010 VMware, Inc., Palo Alto, CA., USA
+ * All Rights Reserved.
+ *
+ * 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS 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.
+ *
+ **************************************************************************/
+/*
+ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
+ */
+
+#include <drm/ttm/ttm_module.h>
+#include <drm/ttm/ttm_bo_driver.h>
+#include <drm/ttm/ttm_placement.h>
+#include <drm/drm_mm.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+
+/**
+ * Currently we use a spinlock for the lock, but a mutex *may* be
+ * more appropriate to reduce scheduling latency if the range manager
+ * ends up with very fragmented allocation patterns.
+ */
+
+struct ttm_range_manager {
+       struct ttm_mem_type_manager manager;
+       struct drm_mm mm;
+       spinlock_t lock;
+};
+
+static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_manager *man)
+{
+       return container_of(man, struct ttm_range_manager, manager);
+}
+
+static int ttm_range_man_get_node(struct ttm_mem_type_manager *man,
+                                 struct ttm_buffer_object *bo,
+                                 const struct ttm_place *place,
+                                 struct ttm_mem_reg *mem)
+{
+       struct ttm_range_manager *rman = to_range_manager(man);
+       struct drm_mm *mm = &rman->mm;
+       struct drm_mm_node *node;
+       enum drm_mm_insert_mode mode;
+       unsigned long lpfn;
+       int ret;
+
+       lpfn = place->lpfn;
+       if (!lpfn)
+               lpfn = man->size;
+
+       node = kzalloc(sizeof(*node), GFP_KERNEL);
+       if (!node)
+               return -ENOMEM;
+
+       mode = DRM_MM_INSERT_BEST;
+       if (place->flags & TTM_PL_FLAG_TOPDOWN)
+               mode = DRM_MM_INSERT_HIGH;
+
+       spin_lock(&rman->lock);
+       ret = drm_mm_insert_node_in_range(mm, node,
+                                         mem->num_pages,
+                                         mem->page_alignment, 0,
+                                         place->fpfn, lpfn, mode);
+       spin_unlock(&rman->lock);
+
+       if (unlikely(ret)) {
+               kfree(node);
+       } else {
+               mem->mm_node = node;
+               mem->start = node->start;
+       }
+
+       return ret;
+}
+
+static void ttm_range_man_put_node(struct ttm_mem_type_manager *man,
+                                  struct ttm_mem_reg *mem)
+{
+       struct ttm_range_manager *rman = to_range_manager(man);
+
+       if (mem->mm_node) {
+               spin_lock(&rman->lock);
+               drm_mm_remove_node(mem->mm_node);
+               spin_unlock(&rman->lock);
+
+               kfree(mem->mm_node);
+               mem->mm_node = NULL;
+       }
+}
+
+static const struct ttm_mem_type_manager_func ttm_range_manager_func;
+
+int ttm_range_man_init(struct ttm_bo_device *bdev,
+                      unsigned type,
+                      uint32_t available_caching,
+                      uint32_t default_caching,
+                      bool use_tt,
+                      unsigned long p_size)
+{
+       struct ttm_mem_type_manager *man;
+       struct ttm_range_manager *rman;
+
+       rman = kzalloc(sizeof(*rman), GFP_KERNEL);
+       if (!rman)
+               return -ENOMEM;
+
+       man = &rman->manager;
+       man->available_caching = available_caching;
+       man->default_caching = default_caching;
+       man->use_tt = use_tt;
+
+       man->func = &ttm_range_manager_func;
+
+       ttm_mem_type_manager_init(man, p_size);
+
+       drm_mm_init(&rman->mm, 0, p_size);
+       spin_lock_init(&rman->lock);
+
+       ttm_set_driver_manager(bdev, type, &rman->manager);
+       ttm_mem_type_manager_set_used(man, true);
+       return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_init);
+
+int ttm_range_man_fini(struct ttm_bo_device *bdev,
+                      unsigned type)
+{
+       struct ttm_mem_type_manager *man = ttm_manager_type(bdev, type);
+       struct ttm_range_manager *rman = to_range_manager(man);
+       struct drm_mm *mm = &rman->mm;
+       int ret;
+
+       ttm_mem_type_manager_set_used(man, false);
+
+       ret = ttm_mem_type_manager_force_list_clean(bdev, man);
+       if (ret)
+               return ret;
+
+       spin_lock(&rman->lock);
+       drm_mm_clean(mm);
+       drm_mm_takedown(mm);
+       spin_unlock(&rman->lock);
+
+       ttm_mem_type_manager_cleanup(man);
+       ttm_set_driver_manager(bdev, type, NULL);
+       kfree(rman);
+       return 0;
+}
+EXPORT_SYMBOL(ttm_range_man_fini);
+
+static void ttm_range_man_debug(struct ttm_mem_type_manager *man,
+                               struct drm_printer *printer)
+{
+       struct ttm_range_manager *rman = to_range_manager(man);
+
+       spin_lock(&rman->lock);
+       drm_mm_print(&rman->mm, printer);
+       spin_unlock(&rman->lock);
+}
+
+static const struct ttm_mem_type_manager_func ttm_range_manager_func = {
+       .get_node = ttm_range_man_get_node,
+       .put_node = ttm_range_man_put_node,
+       .debug = ttm_range_man_debug
+};