Commit 9dd1f152 authored by Kenneth Feng's avatar Kenneth Feng Committed by Alex Deucher
Browse files

drm/amd/pm: move the dpm table setting back after featureenablement 



move the dpm table setting back after featureenablemend due to dependancy.
For SMUv13.0.6, there is no pptable. Those frequency tables are available
through FW metrics and it needs DPM to be enabled.

Signed-off-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9a9e87d1

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

+11 −11
Original line number Diff line number Diff line
@@ -1687,17 +1687,6 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
		}

	}



	/*

	 * Set initialized values (get from vbios) to dpm tables context such as

	 * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each

	 * type of clks.

	 */

	ret = smu_set_default_dpm_table(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");

		return ret;

	}



	if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN5)

		pcie_gen = 4;

	else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN4)
@@ -1753,6 +1742,17 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
	if (!smu_is_dpm_running(smu))

		dev_info(adev->dev, "dpm has been disabled\n");



	/*

	 * Set initialized values (get from vbios) to dpm tables context such as

	 * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each

	 * type of clks.

	 */

	ret = smu_set_default_dpm_table(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");

		return ret;

	}



	ret = smu_get_thermal_temperature_range(smu);

	if (ret) {

		dev_err(adev->dev, "Failed to get thermal temperature ranges!\n");