iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/ttm: rename bo manager to range manager.

Browse Source 
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
This commit is contained in:
Dave Airlie 2020-08-04 12:56:30 +10:00
parent 3f48f938ad
commit 80938c28ee
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/ttm/Makefile
View File

@ -4,7 +4,7 @@
ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \
ttm_bo_util.o ttm_bo_vm.o ttm_module.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_AGP) += ttm_agp_backend.o
ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o

28
drivers/gpu/drm/ttm/ttm_bo_manager.c → drivers/gpu/drm/ttm/ttm_range_manager.c
View File

@ -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); return container_of(man, struct ttm_range_manager, manager);
} }
static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man, static int ttm_range_man_get_node(struct ttm_mem_type_manager *man,
struct ttm_buffer_object *bo, struct ttm_buffer_object *bo,
const struct ttm_place *place, const struct ttm_place *place,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem)
{ {
struct ttm_range_manager *rman = to_range_manager(man); struct ttm_range_manager *rman = to_range_manager(man);
struct drm_mm *mm = &rman->mm; struct drm_mm *mm = &rman->mm;
@ -95,8 +95,8 @@ static int ttm_bo_man_get_node(struct ttm_mem_type_manager *man,
return ret; return ret;
} }
static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man, static void ttm_range_man_put_node(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem) struct ttm_mem_reg *mem)
{ {
struct ttm_range_manager *rman = to_range_manager(man); struct ttm_range_manager *rman = to_range_manager(man);
@ -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, int ttm_range_man_init(struct ttm_bo_device *bdev,
unsigned type, unsigned type,
@ -131,7 +131,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
man->default_caching = default_caching; man->default_caching = default_caching;
man->use_tt = use_tt; 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); ttm_mem_type_manager_init(man, p_size);
@ -170,8 +170,8 @@ int ttm_range_man_fini(struct ttm_bo_device *bdev,
} }
EXPORT_SYMBOL(ttm_range_man_fini); 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 drm_printer *printer)
{ {
struct ttm_range_manager *rman = to_range_manager(man); 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); spin_unlock(&rman->lock);
} }
static const struct ttm_mem_type_manager_func ttm_bo_manager_func = { static const struct ttm_mem_type_manager_func ttm_range_manager_func = {
.get_node = ttm_bo_man_get_node, .get_node = ttm_range_man_get_node,
.put_node = ttm_bo_man_put_node, .put_node = ttm_range_man_put_node,
.debug = ttm_bo_man_debug .debug = ttm_range_man_debug
}; };