Commit 80938c28 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: rename bo manager to range manager. 



The generic manager is called the range manager now, rename
the file and some internals.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-58-airlied@gmail.com
parent 3f48f938

drivers/gpu/drm/ttm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/ttm/ttm_bo_manager.c→drivers/gpu/drm/ttm/ttm_range_manager.c

+14 −14
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 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,

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,7 +95,7 @@ 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,

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);
@@ -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

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE