Commit ec6aae97 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: do not pass ttm_resource_manager to vram_mgr 



Do not allow exported amdgpu_vram_mgr_*() to accept
any ttm_resource_manager pointer. Also there is no need
to force other module to call a ttm function just to
eventually call vram_mgr functions.

v2: pass adev's vram_mgr instead of adev

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ffb378fb

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

+2 −3
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ 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_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.

	 *
@@ -315,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(vram_man);

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

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



	spin_lock(&adev->mm_stats.lock);
@@ -362,7 +361,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(vram_man);

		  amdgpu_vram_mgr_vis_usage(&adev->mman.vram_mgr);



		if (used_vis_vram < total_vis_vram) {

			u64 free_vis_vram = total_vis_vram - used_vis_vram;

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

+4 −6
Original line number Diff line number Diff line
@@ -672,10 +672,10 @@ 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(ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM));

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

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

	case AMDGPU_INFO_VIS_VRAM_USAGE:

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

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

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

	case AMDGPU_INFO_GTT_USAGE:

		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.gtt_mgr);
@@ -709,8 +709,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	}

	case AMDGPU_INFO_MEMORY: {

		struct drm_amdgpu_memory_info mem;

		struct ttm_resource_manager *vram_man =

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

		struct ttm_resource_manager *gtt_man =

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

		memset(&mem, 0, sizeof(mem));
@@ -719,7 +717,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(vram_man);

			amdgpu_vram_mgr_usage(&adev->mman.vram_mgr);

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



		mem.cpu_accessible_vram.total_heap_size =
@@ -729,7 +727,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
			    atomic64_read(&adev->visible_pin_size),

			    mem.vram.usable_heap_size);

		mem.cpu_accessible_vram.heap_usage =

			amdgpu_vram_mgr_vis_usage(vram_man);

			amdgpu_vram_mgr_vis_usage(&adev->mman.vram_mgr);

		mem.cpu_accessible_vram.max_allocation =

			mem.cpu_accessible_vram.usable_heap_size * 3 / 4;

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

+2 −4
Original line number Diff line number Diff line
@@ -1839,8 +1839,7 @@ static int amdgpu_ras_badpages_read(struct amdgpu_device *adev, 
			.size = AMDGPU_GPU_PAGE_SIZE,

			.flags = AMDGPU_RAS_RETIRE_PAGE_RESERVED,

		};

		status = amdgpu_vram_mgr_query_page_status(

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

		status = amdgpu_vram_mgr_query_page_status(&adev->mman.vram_mgr,

				data->bps[i].retired_page);

		if (status == -EBUSY)

			(*bps)[i].flags = AMDGPU_RAS_RETIRE_PAGE_PENDING;
@@ -1941,8 +1940,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev, 
			goto out;

		}



		amdgpu_vram_mgr_reserve_range(

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

		amdgpu_vram_mgr_reserve_range(&adev->mman.vram_mgr,

			bps[i].retired_page << AMDGPU_GPU_PAGE_SHIFT,

			AMDGPU_GPU_PAGE_SIZE);

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

+4 −4
Original line number Diff line number Diff line
@@ -129,11 +129,11 @@ 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 ttm_resource_manager *man);

uint64_t amdgpu_vram_mgr_vis_usage(struct ttm_resource_manager *man);

int amdgpu_vram_mgr_reserve_range(struct ttm_resource_manager *man,

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);

int amdgpu_vram_mgr_query_page_status(struct ttm_resource_manager *man,

int amdgpu_vram_mgr_query_page_status(struct amdgpu_vram_mgr *mgr,

				      uint64_t start);



int amdgpu_ttm_init(struct amdgpu_device *adev);

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

+2 −3
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ static void amdgpu_virt_populate_vf2pf_ucode_info(struct amdgpu_device *adev) 
static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev)

{

	struct amd_sriov_msg_vf2pf_info *vf2pf_info;

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



	vf2pf_info = (struct amd_sriov_msg_vf2pf_info *) adev->virt.fw_reserve.p_vf2pf;
@@ -576,8 +575,8 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev) 
	vf2pf_info->driver_cert = 0;

	vf2pf_info->os_info.all = 0;



	vf2pf_info->fb_usage = amdgpu_vram_mgr_usage(vram_man) >> 20;

	vf2pf_info->fb_vis_usage = amdgpu_vram_mgr_vis_usage(vram_man) >> 20;

	vf2pf_info->fb_usage = amdgpu_vram_mgr_usage(&adev->mman.vram_mgr) >> 20;

	vf2pf_info->fb_vis_usage = amdgpu_vram_mgr_vis_usage(&adev->mman.vram_mgr) >> 20;

	vf2pf_info->fb_size = adev->gmc.real_vram_size >> 20;

	vf2pf_info->fb_vis_size = adev->gmc.visible_vram_size >> 20;