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: c71980a3fc1d ("drm/amdgpu: reduce the full gpu access time in amdgpu_device_init.")
Signed-off-by: chong li <chongli2@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 06f4cdcccb4fed5030c0c33dbef08437809984a3..607859466e63b382dd27c4d94c36e5840b9e7f19 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4931,15 +4931,15 @@ fence_driver_init:
                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