openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/ttm: drop man->bdev link. 

This link isn't needed anymore, drop it from the init interface.

Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-54-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:56:26 +10:00
parent a29050c4cd
commit 7541ce1a6f
9 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
View File

@ -108,7 +108,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
man->available_caching = TTM_PL_MASK_CACHING; man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT); ttm_mem_type_manager_init(man, gtt_size >> PAGE_SHIFT);
start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS; start = AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS;
size = (adev->gmc.gart_size >> PAGE_SHIFT) - start; size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;

2
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
View File

@ -190,7 +190,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC; man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC; man->default_caching = TTM_PL_FLAG_WC;
ttm_mem_type_manager_init(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT); ttm_mem_type_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
man->func = &amdgpu_vram_mgr_func; man->func = &amdgpu_vram_mgr_func;

6
drivers/gpu/drm/nouveau/nouveau_ttm.c
View File

@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
man->func = &nouveau_vram_manager; man->func = &nouveau_vram_manager;
man->use_io_reserve_lru = true; man->use_io_reserve_lru = true;
ttm_mem_type_manager_init(&drm->ttm.bdev, man, ttm_mem_type_manager_init(man,
drm->gem.vram_available >> PAGE_SHIFT); drm->gem.vram_available >> PAGE_SHIFT);
ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man); ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);
ttm_mem_type_manager_set_used(man, true); ttm_mem_type_manager_set_used(man, true);
@ -237,9 +237,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
man->available_caching = available_caching; man->available_caching = available_caching;
man->default_caching = default_caching; man->default_caching = default_caching;
man->use_tt = true; man->use_tt = true;
ttm_mem_type_manager_init(&drm->ttm.bdev, man, ttm_mem_type_manager_init(man, size_pages);
size_pages);
ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man); ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);
ttm_mem_type_manager_set_used(man, true); ttm_mem_type_manager_set_used(man, true);

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

@ -1469,8 +1469,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type)
} }
EXPORT_SYMBOL(ttm_bo_evict_mm); EXPORT_SYMBOL(ttm_bo_evict_mm);
void ttm_mem_type_manager_init(struct ttm_bo_device *bdev, void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
struct ttm_mem_type_manager *man,
unsigned long p_size) unsigned long p_size)
{ {
unsigned i; unsigned i;
@ -1480,7 +1479,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,
mutex_init(&man->io_reserve_mutex); mutex_init(&man->io_reserve_mutex);
spin_lock_init(&man->move_lock); spin_lock_init(&man->move_lock);
INIT_LIST_HEAD(&man->io_reserve_lru); INIT_LIST_HEAD(&man->io_reserve_lru);
man->bdev = bdev;
man->size = p_size; man->size = p_size;
for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i) for (i = 0; i < TTM_MAX_BO_PRIORITY; ++i)
@ -1593,7 +1591,7 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
man->available_caching = TTM_PL_MASK_CACHING; man->available_caching = TTM_PL_MASK_CACHING;
man->default_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(bdev, man, 0); ttm_mem_type_manager_init(man, 0);
ttm_mem_type_manager_set_used(man, true); ttm_mem_type_manager_set_used(man, true);
} }

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

@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
man->func = &ttm_bo_manager_func; man->func = &ttm_bo_manager_func;
ttm_mem_type_manager_init(bdev, man, p_size); ttm_mem_type_manager_init(man, p_size);
drm_mm_init(&rman->mm, 0, p_size); drm_mm_init(&rman->mm, 0, p_size);
spin_lock_init(&rman->lock); spin_lock_init(&rman->lock);

2
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
View File

@ -116,7 +116,7 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
man->default_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED;
/* TODO: This is most likely not correct */ /* TODO: This is most likely not correct */
man->use_tt = true; man->use_tt = true;
ttm_mem_type_manager_init(&dev_priv->bdev, man, 0); ttm_mem_type_manager_init(man, 0);
spin_lock_init(&gman->lock); spin_lock_init(&gman->lock);
gman->used_gmr_pages = 0; gman->used_gmr_pages = 0;
ida_init(&gman->gmr_ida); ida_init(&gman->gmr_ida);

2
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
View File

@ -134,7 +134,7 @@ int vmw_thp_init(struct vmw_private *dev_priv)
man->available_caching = TTM_PL_FLAG_CACHED; man->available_caching = TTM_PL_FLAG_CACHED;
man->default_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(&dev_priv->bdev, man, ttm_mem_type_manager_init(man,
dev_priv->vram_size >> PAGE_SHIFT); dev_priv->vram_size >> PAGE_SHIFT);
drm_mm_init(&rman->mm, 0, man->size); drm_mm_init(&rman->mm, 0, man->size);

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

@ -536,14 +536,12 @@ int ttm_bo_create(struct ttm_bo_device *bdev, unsigned long size,
/** /**
* ttm_mem_type_manager_init * ttm_mem_type_manager_init
* *
* @bdev: Pointer to a ttm_bo_device struct.
* @man: memory manager object to init * @man: memory manager object to init
* @p_size: size managed area in pages. * @p_size: size managed area in pages.
* *
* Initialise core parts of a a manager object. * Initialise core parts of a manager object.
*/ */
void ttm_mem_type_manager_init(struct ttm_bo_device *bdev, void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,
struct ttm_mem_type_manager *man,
unsigned long p_size); unsigned long p_size);
/** /**

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

@ -138,8 +138,6 @@ struct ttm_mem_type_manager_func {
struct ttm_mem_type_manager { struct ttm_mem_type_manager {
struct ttm_bo_device *bdev;
/* /*
* No protection. Constant from start. * No protection. Constant from start.
*/ */