Commit 8af8a109 authored by Christian König's avatar Christian König
Browse files

drm/ttm: device naming cleanup 



Rename ttm_bo_device to ttm_device.
Rename ttm_bo_driver to ttm_device_funcs.
Rename ttm_bo_global to ttm_global.

Move global and device related functions to ttm_device.[ch].

No functional change.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/415222/
parent b99c2c95

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static inline struct drm_device *adev_to_drm(struct amdgpu_device *adev) 
	return &adev->ddev;

}



static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)

static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_device *bdev)

{

	return container_of(bdev, struct amdgpu_device, mman.bdev);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ static atomic_t fence_seq = ATOMIC_INIT(0); 
 * All the BOs in a process share an eviction fence. When process X wants

 * to map VRAM memory but TTM can't find enough space, TTM will attempt to

 * evict BOs from its LRU list. TTM checks if the BO is valuable to evict

 * by calling ttm_bo_driver->eviction_valuable().

 * by calling ttm_device_funcs->eviction_valuable().

 *

 * ttm_bo_driver->eviction_valuable() - will return false if the BO belongs

 * ttm_device_funcs->eviction_valuable() - will return false if the BO belongs

 *  to process X. Otherwise, it will return true to indicate BO can be

 *  evicted by TTM.

 *

 * If ttm_bo_driver->eviction_valuable returns true, then TTM will continue

 * If ttm_device_funcs->eviction_valuable returns true, then TTM will continue

 * the evcition process for that BO by calling ttm_bo_evict --> amdgpu_bo_move

 * --> amdgpu_copy_buffer(). This sets up job in GPU scheduler.

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
 */

static int amdgpu_gart_dummy_page_init(struct amdgpu_device *adev)

{

	struct page *dummy_page = ttm_bo_glob.dummy_read_page;

	struct page *dummy_page = ttm_glob.dummy_read_page;



	if (adev->dummy_page_addr)

		return 0;

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

+13 −13
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ 


#define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128



static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,

static int amdgpu_ttm_backend_bind(struct ttm_device *bdev,

				   struct ttm_tt *ttm,

				   struct ttm_resource *bo_mem);

static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev,

static void amdgpu_ttm_backend_unbind(struct ttm_device *bdev,

				      struct ttm_tt *ttm);



static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
@@ -646,7 +646,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, 
 *

 * Called by ttm_mem_io_reserve() ultimately via ttm_bo_vm_fault()

 */

static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *mem)

static int amdgpu_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resource *mem)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);

	struct drm_mm_node *mm_node = mem->mm_node;
@@ -893,7 +893,7 @@ void amdgpu_ttm_tt_set_user_pages(struct ttm_tt *ttm, struct page **pages) 
 *

 * Called by amdgpu_ttm_backend_bind()

 **/

static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev,

static int amdgpu_ttm_tt_pin_userptr(struct ttm_device *bdev,

				     struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
@@ -931,7 +931,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_bo_device *bdev, 
/*

 * amdgpu_ttm_tt_unpin_userptr - Unpin and unmap userptr pages

 */

static void amdgpu_ttm_tt_unpin_userptr(struct ttm_bo_device *bdev,

static void amdgpu_ttm_tt_unpin_userptr(struct ttm_device *bdev,

					struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
@@ -1015,7 +1015,7 @@ static int amdgpu_ttm_gart_bind(struct amdgpu_device *adev, 
 * Called by ttm_tt_bind() on behalf of ttm_bo_handle_move_mem().

 * This handles binding GTT memory to the device address space.

 */

static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,

static int amdgpu_ttm_backend_bind(struct ttm_device *bdev,

				   struct ttm_tt *ttm,

				   struct ttm_resource *bo_mem)

{
@@ -1155,7 +1155,7 @@ int amdgpu_ttm_recover_gart(struct ttm_buffer_object *tbo) 
 * Called by ttm_tt_unbind() on behalf of ttm_bo_move_ttm() and

 * ttm_tt_destroy().

 */

static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev,

static void amdgpu_ttm_backend_unbind(struct ttm_device *bdev,

				      struct ttm_tt *ttm)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
@@ -1180,7 +1180,7 @@ static void amdgpu_ttm_backend_unbind(struct ttm_bo_device *bdev, 
	gtt->bound = false;

}



static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev,

static void amdgpu_ttm_backend_destroy(struct ttm_device *bdev,

				       struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;
@@ -1234,7 +1234,7 @@ static struct ttm_tt *amdgpu_ttm_tt_create(struct ttm_buffer_object *bo, 
 * Map the pages of a ttm_tt object to an address space visible

 * to the underlying device.

 */

static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev,

static int amdgpu_ttm_tt_populate(struct ttm_device *bdev,

				  struct ttm_tt *ttm,

				  struct ttm_operation_ctx *ctx)

{
@@ -1278,7 +1278,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_bo_device *bdev, 
 * Unmaps pages of a ttm_tt object from the device address space and

 * unpopulates the page array backing it.

 */

static void amdgpu_ttm_tt_unpopulate(struct ttm_bo_device *bdev,

static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev,

				     struct ttm_tt *ttm)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;
@@ -1603,7 +1603,7 @@ amdgpu_bo_delete_mem_notify(struct ttm_buffer_object *bo) 
	amdgpu_bo_move_notify(bo, false, NULL);

}



static struct ttm_bo_driver amdgpu_bo_driver = {

static struct ttm_device_funcs amdgpu_bo_driver = {

	.ttm_tt_create = &amdgpu_ttm_tt_create,

	.ttm_tt_populate = &amdgpu_ttm_tt_populate,

	.ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,
@@ -1785,7 +1785,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	mutex_init(&adev->mman.gtt_window_lock);



	/* No others user of address space so set it to 0 */

	r = ttm_bo_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,

	r = ttm_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,

			       adev_to_drm(adev)->anon_inode->i_mapping,

			       adev_to_drm(adev)->vma_offset_manager,

			       adev->need_swiotlb,
@@ -1926,7 +1926,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GDS);

	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_GWS);

	ttm_range_man_fini(&adev->mman.bdev, AMDGPU_PL_OA);

	ttm_bo_device_release(&adev->mman.bdev);

	ttm_device_fini(&adev->mman.bdev);

	adev->mman.initialized = false;

	DRM_INFO("amdgpu: ttm finalized\n");

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct amdgpu_gtt_mgr { 
};



struct amdgpu_mman {

	struct ttm_bo_device		bdev;

	struct ttm_device		bdev;

	bool				initialized;

	void __iomem			*aper_base_kaddr;