On Tue, 4 Aug 2020 at 21:40, Christian König christian.koenig@amd.com wrote:
Am 04.08.20 um 04:56 schrieb Dave Airlie:
From: Dave Airlie airlied@redhat.com
The generic manager is called the range manager now, rename the file and some internals.
Signed-off-by: Dave Airlie airlied@redhat.com
Reviewed-by: Christian König christian.koenig@amd.com
Reviewed-by: Ben Skeggs bskeggs@redhat.com
drivers/gpu/drm/ttm/Makefile | 2 +- .../{ttm_bo_manager.c => ttm_range_manager.c} | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) rename drivers/gpu/drm/ttm/{ttm_bo_manager.c => ttm_range_manager.c} (88%)
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile index caea2a099496..e54326e6cea4 100644 --- a/drivers/gpu/drm/ttm/Makefile +++ b/drivers/gpu/drm/ttm/Makefile @@ -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.odiff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c similarity index 88% rename from drivers/gpu/drm/ttm/ttm_bo_manager.c rename to drivers/gpu/drm/ttm/ttm_range_manager.c index 6679dc11934f..52d9a0ed7165 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_range_manager.c @@ -54,10 +54,10 @@ static inline struct ttm_range_manager *to_range_manager(struct ttm_mem_type_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)+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)@@ -95,8 +95,8 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man, return ret; }
-static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem)+static void ttm_range_man_put_node(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem)@@ -110,7 +110,7 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man, } }
-static const struct ttm_mem_type_manager_func ttm_bo_manager_func; +static const struct ttm_mem_type_manager_func ttm_range_manager_func;
int ttm_range_man_init(struct ttm_bo_device *bdev, unsigned type, @@ -131,7 +131,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, man->default_caching = default_caching; man->use_tt = use_tt;
man->func = &ttm_bo_manager_func;
man->func = &ttm_range_manager_func; ttm_mem_type_manager_init(man, p_size);@@ -170,7 +170,7 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev, } EXPORT_SYMBOL(ttm_range_man_fini);
-static void ttm_bo_man_debug(struct ttm_mem_type_manager *man, +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); @@ -180,8 +180,8 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man, 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+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
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel