diff options
| author | Dave Airlie <[email protected]> | 2020-08-04 12:56:31 +1000 | 
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-08-06 13:12:40 +1000 | 
| commit | 9de59bc201496f28bb8835c2bcbae3ddb186b548 (patch) | |
| tree | e8468f8c884392df77c2948ffec75a9eba97ffb1 /drivers/gpu/drm/amd | |
| parent | 80938c28ee67bad05b2982410440b5a2d200a2f5 (diff) | |
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: Christian König <[email protected]>
Reviewed-by: Ben Skeggs <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 36 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 | 
8 files changed, 47 insertions, 47 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index ba4d11e8a960..e2b4d3fc601d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -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);  } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 5ef7b3b7c9af..65b67c82a4b9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -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.  	 * diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c index e9de6f9538c0..b9050b7221d5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c @@ -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 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 134cca1af744..fff9c013f337 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -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; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index ced418cba2f7..ce98df5b0c21 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -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 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 555695854076..2fc0214d9a95 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -2012,7 +2012,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)   */  void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)  { -	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM); +	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);  	uint64_t size;  	int r; @@ -2234,7 +2234,7 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data)  	unsigned ttm_pl = (uintptr_t)node->info_ent->data;  	struct drm_device *dev = node->minor->dev;  	struct amdgpu_device *adev = dev->dev_private; -	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, ttm_pl); +	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, ttm_pl);  	struct drm_printer p = drm_seq_file_printer(m);  	man->func->debug(man, &p); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h index c01fdb3f0458..3db29ae1f802 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -73,8 +73,8 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev);  void amdgpu_vram_mgr_fini(struct amdgpu_device *adev);  bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem); -uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man); -int amdgpu_gtt_mgr_recover(struct ttm_mem_type_manager *man); +uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man); +int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man);  u64 amdgpu_vram_mgr_bo_visible_size(struct amdgpu_bo *bo);  int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev, @@ -86,8 +86,8 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,  			      struct device *dev,  			      enum dma_data_direction dir,  			      struct sg_table *sgt); -uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man); -uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man); +uint64_t amdgpu_vram_mgr_usage(struct ttm_resource_manager *man); +uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_resource_manager *man);  int amdgpu_ttm_init(struct amdgpu_device *adev);  void amdgpu_ttm_late_init(struct amdgpu_device *adev); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c index 03a6248f0c4e..6f888a63f22d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c @@ -29,7 +29,7 @@  #include "atom.h"  struct amdgpu_vram_mgr { -	struct ttm_mem_type_manager manager; +	struct ttm_resource_manager manager;  	struct drm_mm mm;  	spinlock_t lock;  	atomic64_t usage; @@ -37,7 +37,7 @@ struct amdgpu_vram_mgr {  	struct amdgpu_device *adev;  }; -static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_mem_type_manager *man) +static inline struct amdgpu_vram_mgr *to_vram_mgr(struct ttm_resource_manager *man)  {  	return container_of(man, struct amdgpu_vram_mgr, manager);  } @@ -89,7 +89,7 @@ static ssize_t amdgpu_mem_info_vram_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_VRAM); +	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);  	return snprintf(buf, PAGE_SIZE, "%llu\n",  			amdgpu_vram_mgr_usage(man));  } @@ -107,7 +107,7 @@ static ssize_t amdgpu_mem_info_vis_vram_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_VRAM); +	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);  	return snprintf(buf, PAGE_SIZE, "%llu\n",  			amdgpu_vram_mgr_vis_usage(man));  } @@ -165,7 +165,7 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {  	NULL  }; -static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func; +static const struct ttm_resource_manager_func amdgpu_vram_mgr_func;  /**   * amdgpu_vram_mgr_init - init VRAM manager and DRM MM @@ -177,7 +177,7 @@ static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;   */  int amdgpu_vram_mgr_init(struct amdgpu_device *adev)  { -	struct ttm_mem_type_manager *man; +	struct ttm_resource_manager *man;  	struct amdgpu_vram_mgr *mgr;  	int ret; @@ -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(man, adev->gmc.real_vram_size >> PAGE_SHIFT); +	ttm_resource_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);  	man->func = &amdgpu_vram_mgr_func; @@ -205,7 +205,7 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)  		DRM_ERROR("Failed to register sysfs\n");  	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, &mgr->manager); -	ttm_mem_type_manager_set_used(man, true); +	ttm_resource_manager_set_used(man, true);  	return 0;  } @@ -219,13 +219,13 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)   */  void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)  { -	struct ttm_mem_type_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM); +	struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);  	struct amdgpu_vram_mgr *mgr = to_vram_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; @@ -235,7 +235,7 @@ void amdgpu_vram_mgr_fini(struct amdgpu_device *adev)  	sysfs_remove_files(&adev->dev->kobj, amdgpu_vram_mgr_attributes); -	ttm_mem_type_manager_cleanup(man); +	ttm_resource_manager_cleanup(man);  	ttm_set_driver_manager(&adev->mman.bdev, TTM_PL_VRAM, NULL);  	kfree(mgr);  } @@ -321,7 +321,7 @@ static void amdgpu_vram_mgr_virt_start(struct ttm_mem_reg *mem,   *   * Allocate VRAM for the given BO.   */ -static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man, +static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,  			       struct ttm_buffer_object *tbo,  			       const struct ttm_place *place,  			       struct ttm_mem_reg *mem) @@ -441,7 +441,7 @@ error:   *   * Free the allocated VRAM again.   */ -static void amdgpu_vram_mgr_del(struct ttm_mem_type_manager *man, +static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man,  				struct ttm_mem_reg *mem)  {  	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); @@ -575,7 +575,7 @@ void amdgpu_vram_mgr_free_sgt(struct amdgpu_device *adev,   *   * Returns how many bytes are used in this domain.   */ -uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man) +uint64_t amdgpu_vram_mgr_usage(struct ttm_resource_manager *man)  {  	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); @@ -589,7 +589,7 @@ uint64_t amdgpu_vram_mgr_usage(struct ttm_mem_type_manager *man)   *   * Returns how many bytes are used in the visible part of VRAM   */ -uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man) +uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_resource_manager *man)  {  	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); @@ -604,7 +604,7 @@ uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_mem_type_manager *man)   *   * Dump the table content using printk.   */ -static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man, +static void amdgpu_vram_mgr_debug(struct ttm_resource_manager *man,  				  struct drm_printer *printer)  {  	struct amdgpu_vram_mgr *mgr = to_vram_mgr(man); @@ -618,7 +618,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,  		   amdgpu_vram_mgr_vis_usage(man) >> 20);  } -static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = { +static const struct ttm_resource_manager_func amdgpu_vram_mgr_func = {  	.get_node	= amdgpu_vram_mgr_new,  	.put_node	= amdgpu_vram_mgr_del,  	.debug		= amdgpu_vram_mgr_debug |