Commit 9de59bc2 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: rename ttm_mem_type_manager -> ttm_resource_manager. 



This name makes a lot more sense, since these are about managing
driver resources rather than just memory ranges.

Acked-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-59-airlied@gmail.com
parent 80938c28

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

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ out_put: 
uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;

	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);

	struct ttm_resource_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);



	return amdgpu_vram_mgr_usage(vram_man);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
{

	s64 time_us, increment_us;

	u64 free_vram, total_vram, used_vram;

	struct ttm_mem_type_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);

	struct ttm_resource_manager *vram_man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);

	/* Allow a maximum of 200 accumulated ms. This is basically per-IB

	 * throttling.

	 *

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

+18 −18
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ 
#include "amdgpu.h"



struct amdgpu_gtt_mgr {

	struct ttm_mem_type_manager manager;

	struct ttm_resource_manager manager;

	struct drm_mm mm;

	spinlock_t lock;

	atomic64_t available;

};



static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_mem_type_manager *man)

static inline struct amdgpu_gtt_mgr *to_gtt_mgr(struct ttm_resource_manager *man)

{

	return container_of(man, struct amdgpu_gtt_mgr, manager);

}
@@ -54,7 +54,7 @@ static ssize_t amdgpu_mem_info_gtt_total_show(struct device *dev, 
{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;

	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	return snprintf(buf, PAGE_SIZE, "%llu\n",

			man->size * PAGE_SIZE);

}
@@ -72,7 +72,7 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev, 
{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;

	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	return snprintf(buf, PAGE_SIZE, "%llu\n",

			amdgpu_gtt_mgr_usage(man));

}
@@ -82,7 +82,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO, 
static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,

	           amdgpu_mem_info_gtt_used_show, NULL);



static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;

static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;

/**

 * amdgpu_gtt_mgr_init - init GTT manager and DRM MM

 *
@@ -93,7 +93,7 @@ static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func; 
 */

int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)

{

	struct ttm_mem_type_manager *man;

	struct ttm_resource_manager *man;

	struct amdgpu_gtt_mgr *mgr;

	uint64_t start, size;

	int ret;
@@ -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(man, gtt_size >> PAGE_SHIFT);

	ttm_resource_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;
@@ -128,7 +128,7 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) 
	}



	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, &mgr->manager);

	ttm_mem_type_manager_set_used(man, true);

	ttm_resource_manager_set_used(man, true);

	return 0;

}
@@ -142,13 +142,13 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size) 
 */

void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev)

{

	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

	int ret;



	ttm_mem_type_manager_set_used(man, false);

	ttm_resource_manager_set_used(man, false);



	ret = ttm_mem_type_manager_force_list_clean(&adev->mman.bdev, man);

	ret = ttm_resource_manager_force_list_clean(&adev->mman.bdev, man);

	if (ret)

		return;
@@ -159,7 +159,7 @@ void amdgpu_gtt_mgr_fini(struct amdgpu_device *adev) 
	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_total);

	device_remove_file(adev->dev, &dev_attr_mem_info_gtt_used);



	ttm_mem_type_manager_cleanup(man);

	ttm_resource_manager_cleanup(man);

	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_TT, NULL);

	kfree(mgr);

}
@@ -186,7 +186,7 @@ bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem) 
 *

 * Dummy, allocate the node but no space for it yet.

 */

static int amdgpu_gtt_mgr_new(struct ttm_mem_type_manager *man,

static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,

			      struct ttm_buffer_object *tbo,

			      const struct ttm_place *place,

			      struct ttm_mem_reg *mem)
@@ -251,7 +251,7 @@ err_out: 
 *

 * Free the allocated GTT again.

 */

static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man,

static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man,

			       struct ttm_mem_reg *mem)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
@@ -274,7 +274,7 @@ static void amdgpu_gtt_mgr_del(struct ttm_mem_type_manager *man, 
 *

 * Return how many bytes are used in the GTT domain

 */

uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man)

uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

	s64 result = man->size - atomic64_read(&mgr->available);
@@ -282,7 +282,7 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man) 
	return (result > 0 ? result : 0) * PAGE_SIZE;

}



int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man)

int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

	struct amdgpu_gtt_node *node;
@@ -309,7 +309,7 @@ int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man) 
 *

 * Dump the table content using printk.

 */

static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,

static void amdgpu_gtt_mgr_debug(struct ttm_resource_manager *man,

				 struct drm_printer *printer)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);
@@ -323,7 +323,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man, 
		   amdgpu_gtt_mgr_usage(man) >> 20);

}



static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {

static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func = {

	.get_node = amdgpu_gtt_mgr_new,

	.put_node = amdgpu_gtt_mgr_del,

	.debug = amdgpu_gtt_mgr_debug

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

+2 −2
Original line number Diff line number Diff line
@@ -616,9 +616,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
	}

	case AMDGPU_INFO_MEMORY: {

		struct drm_amdgpu_memory_info mem;

		struct ttm_mem_type_manager *vram_man =

		struct ttm_resource_manager *vram_man =

			ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);

		struct ttm_mem_type_manager *gtt_man =

		struct ttm_resource_manager *gtt_man =

			ttm_manager_type(&adev->mman.bdev, TTM_PL_TT);

		memset(&mem, 0, sizeof(mem));

		mem.vram.total_heap_size = adev->gmc.real_vram_size;

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

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr, 
static bool amdgpu_bo_validate_size(struct amdgpu_device *adev,

					  unsigned long size, u32 domain)

{

	struct ttm_mem_type_manager *man = NULL;

	struct ttm_resource_manager *man = NULL;



	/*

	 * If GTT is part of requested domains the check must succeed to

CRA Git | Maintained and supported by SUSTech CRA and CCSE