Commit 7541ce1a authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: drop man->bdev link. 



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

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-54-airlied@gmail.com
parent a29050c4

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

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

	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;

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

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

drivers/gpu/drm/nouveau/nouveau_ttm.c

+2 −4
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 
		man->func = &nouveau_vram_manager;

		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);

		ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_VRAM, man);

		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->default_caching = default_caching;

	man->use_tt = true;

	ttm_mem_type_manager_init(&drm->ttm.bdev, man,

				  size_pages);



	ttm_mem_type_manager_init(man, size_pages);

	ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);

	ttm_mem_type_manager_set_used(man, true);

drivers/gpu/drm/ttm/ttm_bo.c

+2 −4
Original line number Diff line number Diff line
@@ -1469,8 +1469,7 @@ int ttm_bo_evict_mm(struct ttm_bo_device *bdev, unsigned mem_type) 
}

EXPORT_SYMBOL(ttm_bo_evict_mm);



void ttm_mem_type_manager_init(struct ttm_bo_device *bdev,

			       struct ttm_mem_type_manager *man,

void ttm_mem_type_manager_init(struct ttm_mem_type_manager *man,

			       unsigned long p_size)

{

	unsigned i;
@@ -1480,7 +1479,6 @@ void ttm_mem_type_manager_init(struct ttm_bo_device *bdev, 
	mutex_init(&man->io_reserve_mutex);

	spin_lock_init(&man->move_lock);

	INIT_LIST_HEAD(&man->io_reserve_lru);

	man->bdev = bdev;

	man->size = p_size;



	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->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);

}

drivers/gpu/drm/ttm/ttm_bo_manager.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, 


	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);

	spin_lock_init(&rman->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE