Commit 362936d6 authored by Victor Skvortsov's avatar Victor Skvortsov Committed by Alex Deucher
Browse files

amdgpu/drm: Use vram manager for virtualization page retirement 



In runtime, use vram manager for virtualization page retirement.

Signed-off-by: default avatarVictor Skvortsov <victor.skvortsov@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2474414c

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

+20 −10
Original line number Diff line number Diff line
@@ -250,11 +250,11 @@ static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev) 
	if (!*data)

		goto data_failure;



	bps = kmalloc_array(align_space, sizeof((*data)->bps), GFP_KERNEL);

	bps = kmalloc_array(align_space, sizeof(*(*data)->bps), GFP_KERNEL);

	if (!bps)

		goto bps_failure;



	bps_bo = kmalloc_array(align_space, sizeof((*data)->bps_bo), GFP_KERNEL);

	bps_bo = kmalloc_array(align_space, sizeof(*(*data)->bps_bo), GFP_KERNEL);

	if (!bps_bo)

		goto bps_bo_failure;
@@ -287,8 +287,10 @@ static void amdgpu_virt_ras_release_bp(struct amdgpu_device *adev) 


	for (i = data->last_reserved - 1; i >= 0; i--) {

		bo = data->bps_bo[i];

		if (bo) {

			amdgpu_bo_free_kernel(&bo, NULL, NULL);

			data->bps_bo[i] = bo;

		}

		data->last_reserved = i;

	}

}
@@ -328,6 +330,8 @@ static void amdgpu_virt_ras_reserve_bps(struct amdgpu_device *adev) 
{

	struct amdgpu_virt *virt = &adev->virt;

	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data;

	struct amdgpu_vram_mgr *mgr = &adev->mman.vram_mgr;

	struct ttm_resource_manager *man = &mgr->manager;

	struct amdgpu_bo *bo = NULL;

	uint64_t bp;

	int i;
@@ -343,12 +347,18 @@ static void amdgpu_virt_ras_reserve_bps(struct amdgpu_device *adev) 
		 * 2) a ras bad page has been reserved (duplicate error injection

		 *    for one page);

		 */

		if  (ttm_resource_manager_used(man)) {

			amdgpu_vram_mgr_reserve_range(&adev->mman.vram_mgr,

				bp << AMDGPU_GPU_PAGE_SHIFT,

				AMDGPU_GPU_PAGE_SIZE);

			data->bps_bo[i] = NULL;

		} else {

			if (amdgpu_bo_create_kernel_at(adev, bp << AMDGPU_GPU_PAGE_SHIFT,

							AMDGPU_GPU_PAGE_SIZE,

							&bo, NULL))

				DRM_DEBUG("RAS WARN: reserve vram for retired page %llx fail\n", bp);



			data->bps_bo[i] = bo;

		}

		data->last_reserved = i + 1;

		bo = NULL;

	}