Commit 32806038 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Load SMU microcode during early_init 



This will ensure that the microcode is available before the firmware
framebuffer has been destroyed.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 315d1716

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+5 −7
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ static int smu_early_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu;

	int r;



	smu = kzalloc(sizeof(struct smu_context), GFP_KERNEL);

	if (!smu)
@@ -640,7 +641,10 @@ static int smu_early_init(void *handle) 
	adev->powerplay.pp_handle = smu;

	adev->powerplay.pp_funcs = &swsmu_pm_funcs;



	return smu_set_funcs(adev);

	r = smu_set_funcs(adev);

	if (r)

		return r;

	return smu_init_microcode(smu);

}



static int smu_set_default_dpm_table(struct smu_context *smu)
@@ -1067,12 +1071,6 @@ static int smu_sw_init(void *handle) 
	smu->smu_dpm.dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;

	smu->smu_dpm.requested_dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;



	ret = smu_init_microcode(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to load smu firmware!\n");

		return ret;

	}



	ret = smu_smc_table_sw_init(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to sw init smc table!\n");