Commit 12323f95 authored by chong li's avatar chong li Committed by Alex Deucher
Browse files

drm/amdgpu: fix issue when switch NPS1 to NPSX 



fix the function execution sequence after removing
kgd2kfd_init_zone_device out of gpu full access region.

Fixes: c71980a3 ("drm/amdgpu: reduce the full gpu access time in amdgpu_device_init.")
Signed-off-by: default avatarchong li <chongli2@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ec227c1

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

+3 −3
Original line number Diff line number Diff line
@@ -4931,15 +4931,15 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
		flush_delayed_work(&adev->delayed_init_work);

	}



	if (adev->init_lvl->level == AMDGPU_INIT_LEVEL_MINIMAL_XGMI)

		amdgpu_xgmi_reset_on_init(adev);



	/* Don't init kfd if whole hive need to be reset during init */

	if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) {

		kgd2kfd_init_zone_device(adev);

		kfd_update_svm_support_properties(adev);

	}



	if (adev->init_lvl->level == AMDGPU_INIT_LEVEL_MINIMAL_XGMI)

		amdgpu_xgmi_reset_on_init(adev);



	/*

	 * Place those sysfs registering after `late_init`. As some of those

	 * operations performed in `late_init` might affect the sysfs