Commit 7db47b83 authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: remove VRAM accounting v2 



This is provided by TTM now.

Also switch man->size to bytes instead of pages and fix the double
printing of size and usage in debugfs.

v2: fix size checking as well

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220214093439.2989-8-christian.koenig@amd.com
parent 3fc2b087

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

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



	total_vram = adev->gmc.real_vram_size - atomic64_read(&adev->vram_pin_size);

	used_vram = amdgpu_vram_mgr_usage(&adev->mman.vram_mgr);

	used_vram = ttm_resource_manager_usage(&adev->mman.vram_mgr.manager);

	free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;



	spin_lock(&adev->mm_stats.lock);

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

+4 −2
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		ui64 = atomic64_read(&adev->num_vram_cpu_page_faults);

		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;

	case AMDGPU_INFO_VRAM_USAGE:

		ui64 = amdgpu_vram_mgr_usage(&adev->mman.vram_mgr);

		ui64 = ttm_resource_manager_usage(&adev->mman.vram_mgr.manager);

		return copy_to_user(out, &ui64, min(size, 8u)) ? -EFAULT : 0;

	case AMDGPU_INFO_VIS_VRAM_USAGE:

		ui64 = amdgpu_vram_mgr_vis_usage(&adev->mman.vram_mgr);
@@ -717,6 +717,8 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		struct drm_amdgpu_memory_info mem;

		struct ttm_resource_manager *gtt_man =

			&adev->mman.gtt_mgr.manager;

		struct ttm_resource_manager *vram_man =

			&adev->mman.vram_mgr.manager;



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

		mem.vram.total_heap_size = adev->gmc.real_vram_size;
@@ -724,7 +726,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			atomic64_read(&adev->vram_pin_size) -

			AMDGPU_VM_RESERVED_VRAM;

		mem.vram.heap_usage =

			amdgpu_vram_mgr_usage(&adev->mman.vram_mgr);

			ttm_resource_manager_usage(vram_man);

		mem.vram.max_allocation = mem.vram.usable_heap_size * 3 / 4;



		mem.cpu_accessible_vram.total_heap_size =

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ static bool amdgpu_bo_validate_size(struct amdgpu_device *adev, 
	if (domain & AMDGPU_GEM_DOMAIN_VRAM) {

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



		if (size < (man->size << PAGE_SHIFT))

		if (size < man->size)

			return true;

		else

			goto fail;

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

+1 −1
Original line number Diff line number Diff line
@@ -1884,7 +1884,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable) 
		size = adev->gmc.real_vram_size;

	else

		size = adev->gmc.visible_vram_size;

	man->size = size >> PAGE_SHIFT;

	man->size = size;

	adev->mman.buffer_funcs_enabled = enable;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct amdgpu_vram_mgr { 
	spinlock_t lock;

	struct list_head reservations_pending;

	struct list_head reserved_pages;

	atomic64_t usage;

	atomic64_t vis_usage;

};
@@ -122,7 +121,6 @@ int amdgpu_vram_mgr_alloc_sgt(struct amdgpu_device *adev, 
void amdgpu_vram_mgr_free_sgt(struct device *dev,

			      enum dma_data_direction dir,

			      struct sg_table *sgt);

uint64_t amdgpu_vram_mgr_usage(struct amdgpu_vram_mgr *mgr);

uint64_t amdgpu_vram_mgr_vis_usage(struct amdgpu_vram_mgr *mgr);

int amdgpu_vram_mgr_reserve_range(struct amdgpu_vram_mgr *mgr,

				  uint64_t start, uint64_t size);