Commit 6c28aed6 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/amdgfx/ttm: use wrapper to get ttm memory managers 



Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-38-airlied@gmail.com
parent 9eca33f4

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

+2 −1
Original line number Diff line number Diff line
@@ -517,8 +517,9 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, 
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);



	return amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

	return amdgpu_vram_mgr_usage(vram_man);

}



uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd)

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

+3 −3
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);

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

	 * throttling.

	 *
@@ -316,7 +316,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.bdev.man[TTM_PL_VRAM]);

	used_vram = amdgpu_vram_mgr_usage(vram_man);

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



	spin_lock(&adev->mm_stats.lock);
@@ -363,7 +363,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
	if (!amdgpu_gmc_vram_full_visible(&adev->gmc)) {

		u64 total_vis_vram = adev->gmc.visible_vram_size;

		u64 used_vis_vram =

			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

		  amdgpu_vram_mgr_vis_usage(vram_man);



		if (used_vis_vram < total_vis_vram) {

			u64 free_vis_vram = total_vis_vram - used_vis_vram;

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

+2 −3
Original line number Diff line number Diff line
@@ -3839,7 +3839,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 


	amdgpu_virt_init_data_exchange(adev);

	/* we need recover gart prior to run SMC/CP/SDMA resume */

	amdgpu_gtt_mgr_recover(&adev->mman.bdev.man[TTM_PL_TT]);

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



	r = amdgpu_device_fw_loading(adev);

	if (r)
@@ -4037,8 +4037,7 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive, 
					amdgpu_inc_vram_lost(tmp_adev);

				}



				r = amdgpu_gtt_mgr_recover(

					&tmp_adev->mman.bdev.man[TTM_PL_TT]);

				r = amdgpu_gtt_mgr_recover(ttm_manager_type(&tmp_adev->mman.bdev, TTM_PL_TT));

				if (r)

					goto out;

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

+6 −6
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ 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);

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

			(adev->mman.bdev.man[TTM_PL_TT].size) * PAGE_SIZE);

			man->size * PAGE_SIZE);

}



/**
@@ -66,9 +66,9 @@ 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);

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

			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]));

			amdgpu_gtt_mgr_usage(man));

}



static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
@@ -87,7 +87,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 = &adev->mman.bdev.man[TTM_PL_TT];

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

	struct amdgpu_gtt_mgr *mgr;

	uint64_t start, size;

	int ret;
@@ -135,7 +135,7 @@ 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 = &adev->mman.bdev.man[TTM_PL_TT];

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

	struct amdgpu_gtt_mgr *mgr = man->priv;

	int ret;

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

+12 −9
Original line number Diff line number Diff line
@@ -579,13 +579,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
		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.bdev.man[TTM_PL_VRAM]);

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

		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.bdev.man[TTM_PL_VRAM]);

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

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

	case AMDGPU_INFO_GTT_USAGE:

		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);

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

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

	case AMDGPU_INFO_GDS_CONFIG: {

		struct drm_amdgpu_info_gds gds_info;
@@ -608,7 +608,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			min(adev->gmc.visible_vram_size -

			    atomic64_read(&adev->visible_pin_size),

			    vram_gtt.vram_size);

		vram_gtt.gtt_size = adev->mman.bdev.man[TTM_PL_TT].size;

		vram_gtt.gtt_size = ttm_manager_type(&adev->mman.bdev, TTM_PL_TT)->size;

		vram_gtt.gtt_size *= PAGE_SIZE;

		vram_gtt.gtt_size -= atomic64_read(&adev->gart_pin_size);

		return copy_to_user(out, &vram_gtt,
@@ -616,14 +616,17 @@ 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 =

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

		struct ttm_mem_type_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;

		mem.vram.usable_heap_size = adev->gmc.real_vram_size -

			atomic64_read(&adev->vram_pin_size) -

			AMDGPU_VM_RESERVED_VRAM;

		mem.vram.heap_usage =

			amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

			amdgpu_vram_mgr_usage(vram_man);

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



		mem.cpu_accessible_vram.total_heap_size =
@@ -633,16 +636,16 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			    atomic64_read(&adev->visible_pin_size),

			    mem.vram.usable_heap_size);

		mem.cpu_accessible_vram.heap_usage =

			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

			amdgpu_vram_mgr_vis_usage(vram_man);

		mem.cpu_accessible_vram.max_allocation =

			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;



		mem.gtt.total_heap_size = adev->mman.bdev.man[TTM_PL_TT].size;

		mem.gtt.total_heap_size = gtt_man->size;

		mem.gtt.total_heap_size *= PAGE_SIZE;

		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -

			atomic64_read(&adev->gart_pin_size);

		mem.gtt.heap_usage =

			amdgpu_gtt_mgr_usage(&adev->mman.bdev.man[TTM_PL_TT]);

			amdgpu_gtt_mgr_usage(gtt_man);

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



		return copy_to_user(out, &mem,