Commit 1cbac73d authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Move reset-on-init sequence earlier 



Complete reset-on-init sequence before sysfs interfaces are created.
Devices get properly initiaized only after reset, and then only sysfs
interfaces should be made available.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9e2096ba

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

+2 −3
Original line number Diff line number Diff line
@@ -4857,6 +4857,8 @@ 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);

	/*

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

	 * operations performed in `late_init` might affect the sysfs
@@ -4890,9 +4892,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (px)

		vga_switcheroo_init_domain_pm_ops(adev->dev, &adev->vga_pm_domain);



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

		amdgpu_xgmi_reset_on_init(adev);



	amdgpu_device_check_iommu_direct_map(adev);



	adev->pm_nb.notifier_call = amdgpu_device_pm_notifier;