Commit 90bcb9b5 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: revise the device initialization sequences 



By placing the sysfs interfaces creation after `.late_int`. Since some
operations performed during `.late_init` may affect how the sysfs
interfaces should be created.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e38b634

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

+21 −16
Original line number Diff line number Diff line
@@ -3862,22 +3862,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	/* Get a log2 for easy divisions. */

	adev->mm_stats.log2_max_MBps = ilog2(max(1u, max_MBps));



	r = amdgpu_atombios_sysfs_init(adev);

	if (r)

		drm_err(&adev->ddev,

			"registering atombios sysfs failed (%d).\n", r);



	r = amdgpu_pm_sysfs_init(adev);

	if (r)

		DRM_ERROR("registering pm sysfs failed (%d).\n", r);



	r = amdgpu_ucode_sysfs_init(adev);

	if (r) {

		adev->ucode_sysfs_en = false;

		DRM_ERROR("Creating firmware sysfs failed (%d).\n", r);

	} else

		adev->ucode_sysfs_en = true;



	/*

	 * Register gpu instance before amdgpu_device_enable_mgpu_fan_boost.

	 * Otherwise the mgpu fan boost feature will be skipped due to the
@@ -3906,6 +3890,27 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
		flush_delayed_work(&adev->delayed_init_work);

	}



	/*

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

	 * operations performed in `late_init` might affect the sysfs

	 * interfaces creating.

	 */

	r = amdgpu_atombios_sysfs_init(adev);

	if (r)

		drm_err(&adev->ddev,

			"registering atombios sysfs failed (%d).\n", r);



	r = amdgpu_pm_sysfs_init(adev);

	if (r)

		DRM_ERROR("registering pm sysfs failed (%d).\n", r);



	r = amdgpu_ucode_sysfs_init(adev);

	if (r) {

		adev->ucode_sysfs_en = false;

		DRM_ERROR("Creating firmware sysfs failed (%d).\n", r);

	} else

		adev->ucode_sysfs_en = true;



	r = sysfs_create_files(&adev->dev->kobj, amdgpu_dev_attributes);

	if (r)

		dev_err(adev->dev, "Could not create amdgpu device attr\n");