Commit a751612d authored by Dave Airlie's avatar Dave Airlie
Browse files

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: 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-55-airlied@gmail.com
parent 7541ce1a

drivers/gpu/drm/ttm/ttm_bo.c

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

include/drm/ttm/ttm_bo_driver.h

+2 −4
Original line number Diff line number Diff line
@@ -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];

}



static inline void ttm_set_driver_manager(struct ttm_bo_device *bdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE