Commit 3f268ef0 authored by Christian König's avatar Christian König
Browse files

drm/ttm: add back a reference to the bdev to the res manager 



It is simply a lot cleaner to have this around instead of adding
the device throughout the call chain.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220124122514.1832-3-christian.koenig@amd.com
parent de3688e4

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

+2 −1
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) 
	man->use_tt = true;

	man->func = &amdgpu_gtt_mgr_func;



	ttm_resource_manager_init(man, gtt_size >> PAGE_SHIFT);

	ttm_resource_manager_init(man, &adev->mman.bdev,

				  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_preempt_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ int amdgpu_preempt_mgr_init(struct amdgpu_device *adev) 
	man->use_tt = true;

	man->func = &amdgpu_preempt_mgr_func;



	ttm_resource_manager_init(man, (1 << 30));

	ttm_resource_manager_init(man, &adev->mman.bdev, (1 << 30));



	atomic64_set(&mgr->used, 0);

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

+2 −1
Original line number Diff line number Diff line
@@ -699,7 +699,8 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev) 
	struct amdgpu_vram_mgr *mgr = &adev->mman.vram_mgr;

	struct ttm_resource_manager *man = &mgr->manager;



	ttm_resource_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);

	ttm_resource_manager_init(man, &adev->mman.bdev,

				  adev->gmc.real_vram_size >> PAGE_SHIFT);



	man->func = &amdgpu_vram_mgr_func;

drivers/gpu/drm/i915/i915_ttm_buddy_manager.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ int i915_ttm_buddy_man_init(struct ttm_device *bdev, 
	man = &bman->manager;

	man->use_tt = use_tt;

	man->func = &i915_ttm_buddy_manager_func;

	ttm_resource_manager_init(man, bman->mm.size >> PAGE_SHIFT);

	ttm_resource_manager_init(man, bdev, bman->mm.size >> PAGE_SHIFT);



	ttm_resource_manager_set_used(man, true);

	ttm_set_driver_manager(bdev, type, man);

drivers/gpu/drm/nouveau/nouveau_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm) 


		man->func = &nouveau_vram_manager;



		ttm_resource_manager_init(man,

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

					  drm->gem.vram_available >> PAGE_SHIFT);

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

		ttm_resource_manager_set_used(man, true);
@@ -211,7 +211,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm) 


	man->func = func;

	man->use_tt = true;

	ttm_resource_manager_init(man, size_pages);

	ttm_resource_manager_init(man, &drm->ttm.bdev, size_pages);

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

	ttm_resource_manager_set_used(man, true);

	return 0;