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

drm/amdgpu: do not pass ttm_resource_manager to gtt_mgr 



Do not allow exported amdgpu_gtt_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 gtt_mgr functions.

v4: remove unused adev.
v3: upcast mgr from ttm resopurce manager instead of
getting it from adev.
v2: pass adev's gtt_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 62d5f9f7

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

+2 −2
Original line number Diff line number Diff line
@@ -4371,7 +4371,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(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));

	amdgpu_gtt_mgr_recover(&adev->mman.gtt_mgr);



	r = amdgpu_device_fw_loading(adev);

	if (r)
@@ -4691,7 +4691,7 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
					amdgpu_inc_vram_lost(tmp_adev);

				}



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

				r = amdgpu_gtt_mgr_recover(&tmp_adev->mman.gtt_mgr);

				if (r)

					goto out;

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

+6 −11
Original line number Diff line number Diff line
@@ -77,10 +77,8 @@ static ssize_t amdgpu_mem_info_gtt_used_show(struct device *dev, 
{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct ttm_resource_manager *man;



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

	return sysfs_emit(buf, "%llu\n", amdgpu_gtt_mgr_usage(man));

	return sysfs_emit(buf, "%llu\n", amdgpu_gtt_mgr_usage(&adev->mman.gtt_mgr));

}



static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
@@ -206,30 +204,27 @@ static void amdgpu_gtt_mgr_del(struct ttm_resource_manager *man, 
/**

 * amdgpu_gtt_mgr_usage - return usage of GTT domain

 *

 * @man: TTM memory type manager

 * @mgr: amdgpu_gtt_mgr pointer

 *

 * Return how many bytes are used in the GTT domain

 */

uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man)

uint64_t amdgpu_gtt_mgr_usage(struct amdgpu_gtt_mgr *mgr)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);



	return atomic64_read(&mgr->used) * PAGE_SIZE;

}



/**

 * amdgpu_gtt_mgr_recover - re-init gart

 *

 * @man: TTM memory type manager

 * @mgr: amdgpu_gtt_mgr pointer

 *

 * Re-init the gart for each known BO in the GTT.

 */

int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man)

int amdgpu_gtt_mgr_recover(struct amdgpu_gtt_mgr *mgr)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

	struct amdgpu_device *adev;

	struct amdgpu_gtt_node *node;

	struct drm_mm_node *mm_node;

	struct amdgpu_device *adev;

	int r = 0;



	adev = container_of(mgr, typeof(*adev), mman.gtt_mgr);

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

+2 −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 = 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(ttm_manager_type(&adev->mman.bdev, TTM_PL_TT));

		ui64 = amdgpu_gtt_mgr_usage(&adev->mman.gtt_mgr);

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

	case AMDGPU_INFO_GDS_CONFIG: {

		struct drm_amdgpu_info_gds gds_info;
@@ -738,7 +738,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		mem.gtt.usable_heap_size = mem.gtt.total_heap_size -

			atomic64_read(&adev->gart_pin_size);

		mem.gtt.heap_usage =

			amdgpu_gtt_mgr_usage(gtt_man);

			amdgpu_gtt_mgr_usage(&adev->mman.gtt_mgr);

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



		return copy_to_user(out, &mem,

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

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,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_resource *mem);

uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man);

int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man);

uint64_t amdgpu_gtt_mgr_usage(struct amdgpu_gtt_mgr *mgr);

int amdgpu_gtt_mgr_recover(struct amdgpu_gtt_mgr *mgr);



uint64_t amdgpu_preempt_mgr_usage(struct ttm_resource_manager *man);