Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/ttm: start allowing drivers to use new takedown path (v2)

Browse Source 
Allow the takedown path callback to be optional as well.

v2: use fini for range manager

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-27-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:55:59 +10:00
parent 4265accbfc
commit 56ee8b1c71
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/ttm/ttm_bo.c
View File

@ -1405,8 +1405,8 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
}
EXPORT_SYMBOL(ttm_bo_create);
static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man)
int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man)
{
struct ttm_operation_ctx ctx = {
.interruptible = false,
@ -1448,6 +1448,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
return 0;
}
EXPORT_SYMBOL(ttm_mem_type_manager_force_list_clean);
int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
{
@ -1470,13 +1471,14 @@ int ttm_bo_clean_mm(struct ttm_bo_device *bdev, unsigned mem_type)
ret = 0;
if (mem_type > 0) {
ret = ttm_bo_force_list_clean(bdev, man);
ret = ttm_mem_type_manager_force_list_clean(bdev, man);
if (ret) {
pr_err("Cleanup eviction failed\n");
return ret;
}
ret = (*man->func->takedown)(man);
if (man->func->takedown)
ret = (*man->func->takedown)(man);
}
ttm_mem_type_manager_cleanup(man);
@ -1499,7 +1501,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
return 0;
}
return ttm_bo_force_list_clean(bdev, man);
return ttm_mem_type_manager_force_list_clean(bdev, man);
}
EXPORT_SYMBOL(ttm_bo_evict_mm);

21
drivers/gpu/drm/ttm/ttm_bo_manager.c
View File

@ -129,7 +129,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
}
EXPORT_SYMBOL(ttm_range_man_init);
static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
static int ttm_bo_man_takedown_private(struct ttm_mem_type_manager *man)
{
struct ttm_range_manager *rman = (struct ttm_range_manager *) man->priv;
struct drm_mm *mm = &rman->mm;
@ -146,6 +146,23 @@ static int ttm_bo_man_takedown(struct ttm_mem_type_manager *man)
return -EBUSY;
}
int ttm_range_man_fini(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man)
{
int ret;
ttm_mem_type_manager_disable(man);
ret = ttm_mem_type_manager_force_list_clean(bdev, man);
if (ret)
return ret;
ttm_bo_man_takedown_private(man);
ttm_mem_type_manager_cleanup(man);
return 0;
}
EXPORT_SYMBOL(ttm_range_man_fini);
static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
struct drm_printer *printer)
{
@ -157,7 +174,7 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
}
static const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
.takedown = ttm_bo_man_takedown,
.takedown = ttm_bo_man_takedown_private,
.get_node = ttm_bo_man_get_node,
.put_node = ttm_bo_man_put_node,
.debug = ttm_bo_man_debug

24
include/drm/ttm/ttm_bo_driver.h
View File

@ -717,6 +717,18 @@ static inline void ttm_mem_type_manager_cleanup(struct ttm_mem_type_manager *man
man->move = NULL;
}
/*
* ttm_mem_type_manager_force_list_clean
*
* @bdev - device to use
* @man - manager to use
*
* Force all the objects out of a memory manager until clean.
* Part of memory manager cleanup sequence.
*/
int ttm_mem_type_manager_force_list_clean(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man);
/*
* ttm_bo_util.c
*/
@ -846,6 +858,17 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man,
unsigned long p_size);
/**
* ttm_range_man_fini
*
* @bdev: ttm device
* @type: memory manager type
*
* Remove the generic range manager from a slot and tear it down.
*/
int ttm_range_man_fini(struct ttm_bo_device *bdev,
struct ttm_mem_type_manager *man);
/**
* ttm_mem_type_manager_debug
*
@ -854,4 +877,5 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
*/
void ttm_mem_type_manager_debug(struct ttm_mem_type_manager *man,
struct drm_printer *p);
#endif