From: Junhua Shen <[email protected]> Call amdgpu_svm_migration_init() in the device initialization and XGMI reset-restore paths to register the GPU's VRAM as a ZONE_DEVICE region before KFD initialization.
This activates the drm_pagemap migration infrastructure. Signed-off-by: Junhua Shen <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 44091ac12fa9c..ef3a5f844444a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -80,6 +80,7 @@ #include "amdgpu_reset.h" #include "amdgpu_virt.h" #include "amdgpu_dev_coredump.h" +#include "amdgpu_migrate.h" #include <linux/suspend.h> #include <drm/task_barrier.h> @@ -4181,6 +4182,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, /* Don't init kfd if whole hive need to be reset during init */ if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) { + amdgpu_svm_migration_init(adev); kgd2kfd_init_zone_device(adev); kfd_update_svm_support_properties(adev); } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c index c8016fa55a92f..571dd062547ce 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c @@ -26,6 +26,7 @@ #include "sienna_cichlid.h" #include "smu_v13_0_10.h" #include "soc_v1_0.h" +#include "amdgpu_migrate.h" static int amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev) { @@ -88,6 +89,7 @@ static int amdgpu_reset_xgmi_reset_on_init_restore_hwctxt( return r; list_for_each_entry(tmp_adev, reset_device_list, reset_list) { if (!tmp_adev->kfd.init_complete) { + amdgpu_svm_migration_init(tmp_adev); kgd2kfd_init_zone_device(tmp_adev); amdgpu_amdkfd_device_init(tmp_adev); amdgpu_amdkfd_drm_client_create(tmp_adev); -- 2.53.0
