Commit 288908ed authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: update the hw initialization sequence around pptable setup 



Place pptable setup after smu_set_driver_table_location. As under SCPM
enabled scenario, the latter one is a prerequisite for the former one.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 593a54f1

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

+7 −6
Original line number Diff line number Diff line
@@ -1141,7 +1141,14 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
		return ret;

	}



	ret = smu_setup_pptable(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to setup pptable!\n");

		return ret;

	}



	/* smu_dump_pptable(smu); */



	/*

	 * Copy pptable bo in the vram to smc with SMU MSGs such as

	 * SetDriverDramAddr and TransferTableDram2Smu.
@@ -1311,12 +1318,6 @@ static int smu_hw_init(void *handle) 
	if (!smu->pm_enabled)

		return 0;



	ret = smu_setup_pptable(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to setup pptable!\n");

		return ret;

	}



	ret = smu_get_driver_allowed_feature_mask(smu);

	if (ret)

		return ret;