Commit e92ae67d authored by Christian König's avatar Christian König
Browse files

drm/ttm: rename ttm_resource_manager_func callbacks 



The names get/put are associated with reference counting
in the Linux kernel, use alloc/free instead.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/384340/?series=80346&rev=1
parent 13b0d4a9

drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man, 
}



static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {

	.get_node = amdgpu_gtt_mgr_new,

	.put_node = amdgpu_gtt_mgr_del,

	.alloc = amdgpu_gtt_mgr_new,

	.free = amdgpu_gtt_mgr_del,

	.debug = amdgpu_gtt_mgr_debug

};

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+3 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_resource_manager *man, 
}



static const struct ttm_resource_manager_func amdgpu_vram_mgr_func = {

	.get_node	= amdgpu_vram_mgr_new,

	.put_node	= amdgpu_vram_mgr_del,

	.alloc	= amdgpu_vram_mgr_new,

	.free	= amdgpu_vram_mgr_del,

	.debug	= amdgpu_vram_mgr_debug

};

drivers/gpu/drm/nouveau/nouveau_ttm.c

+6 −6
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ nouveau_vram_manager_new(struct ttm_resource_manager *man, 
}



const struct ttm_resource_manager_func nouveau_vram_manager = {

	.get_node = nouveau_vram_manager_new,

	.put_node = nouveau_manager_del,

	.alloc = nouveau_vram_manager_new,

	.free = nouveau_manager_del,

};



static int
@@ -87,8 +87,8 @@ nouveau_gart_manager_new(struct ttm_resource_manager *man, 
}



const struct ttm_resource_manager_func nouveau_gart_manager = {

	.get_node = nouveau_gart_manager_new,

	.put_node = nouveau_manager_del,

	.alloc = nouveau_gart_manager_new,

	.free = nouveau_manager_del,

};



static int
@@ -119,8 +119,8 @@ nv04_gart_manager_new(struct ttm_resource_manager *man, 
}



const struct ttm_resource_manager_func nv04_gart_manager = {

	.get_node = nv04_gart_manager_new,

	.put_node = nouveau_manager_del,

	.alloc = nv04_gart_manager_new,

	.free = nouveau_manager_del,

};



int

drivers/gpu/drm/ttm/ttm_bo.c

+4 −4
Original line number Diff line number Diff line
@@ -846,20 +846,20 @@ static int ttm_bo_mem_get(struct ttm_buffer_object *bo, 
	struct ttm_resource_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);



	mem->mm_node = NULL;

	if (!man->func || !man->func->get_node)

	if (!man->func || !man->func->alloc)

		return 0;



	return man->func->get_node(man, bo, place, mem);

	return man->func->alloc(man, bo, place, mem);

}



void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_resource *mem)

{

	struct ttm_resource_manager *man = ttm_manager_type(bo->bdev, mem->mem_type);



	if (!man->func || !man->func->put_node)

	if (!man->func || !man->func->free)

		return;



	man->func->put_node(man, mem);

	man->func->free(man, mem);

	mem->mm_node = NULL;

	mem->mem_type = TTM_PL_SYSTEM;

}

drivers/gpu/drm/ttm/ttm_range_manager.c

+8 −8
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline struct ttm_range_manager *to_range_manager(struct ttm_resource_man 
	return container_of(man, struct ttm_range_manager, manager);

}



static int ttm_range_man_get_node(struct ttm_resource_manager *man,

static int ttm_range_man_alloc(struct ttm_resource_manager *man,

			       struct ttm_buffer_object *bo,

			       const struct ttm_place *place,

			       struct ttm_resource *mem)
@@ -95,7 +95,7 @@ static int ttm_range_man_get_node(struct ttm_resource_manager *man, 
	return ret;

}



static void ttm_range_man_put_node(struct ttm_resource_manager *man,

static void ttm_range_man_free(struct ttm_resource_manager *man,

			       struct ttm_resource *mem)

{

	struct ttm_range_manager *rman = to_range_manager(man);
@@ -181,7 +181,7 @@ static void ttm_range_man_debug(struct ttm_resource_manager *man, 
}



static const struct ttm_resource_manager_func ttm_range_manager_func = {

	.get_node = ttm_range_man_get_node,

	.put_node = ttm_range_man_put_node,

	.alloc = ttm_range_man_alloc,

	.free = ttm_range_man_free,

	.debug = ttm_range_man_debug

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE