UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/ttm: drop list of memory managers from device. (v2) 

The driver now controls these, the core just controls the system
memory one.

v2: init sysman explicitly and assign it as a driver manager
to simplify the lookup sequence.

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

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

@ -1556,6 +1556,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
ttm_mem_type_manager_disable(man);
ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, NULL);
mutex_lock(&ttm_global_mutex);
list_del(&bdev->device_list);
@ -1581,7 +1582,7 @@ EXPORT_SYMBOL(ttm_bo_device_release);
static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
{
struct ttm_mem_type_manager *man = ttm_manager_type(bdev, TTM_PL_SYSTEM);
struct ttm_mem_type_manager *man = &bdev->sysman;
/*
* Initialize the system memory buffer type.
@ -1592,6 +1593,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(man, 0);
ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man);
ttm_mem_type_manager_set_used(man, true);
}
@ -1613,8 +1615,6 @@ int ttm_bo_device_init(struct ttm_bo_device *bdev,
bdev->driver = driver;
memset(bdev->man_priv, 0, sizeof(bdev->man_priv));
ttm_bo_init_sysman(bdev);
bdev->vma_manager = vma_manager;

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

@ -414,7 +414,7 @@ struct ttm_bo_device {
/*
* access via ttm_manager_type.
*/
struct ttm_mem_type_manager man_priv[TTM_NUM_MEM_TYPES];
struct ttm_mem_type_manager sysman;
struct ttm_mem_type_manager *man_drv[TTM_NUM_MEM_TYPES];
/*
* Protected by internal locks.
@ -446,9 +446,7 @@ struct ttm_bo_device {
static inline struct ttm_mem_type_manager *ttm_manager_type(struct ttm_bo_device *bdev,
int mem_type)
{
if (bdev->man_drv[mem_type])
return bdev->man_drv[mem_type];
return &bdev->man_priv[mem_type];
return bdev->man_drv[mem_type];
}
static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,