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

drm/amd/pm: correct SMU OverridePcieParameters related settings 



Correct the hw initialization sequence.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b5f9891

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

+11 −11
Original line number Original line Diff line number Diff line
@@ -1218,6 +1218,17 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
	if (!smu_is_dpm_running(smu))

	if (!smu_is_dpm_running(smu))

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

		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;

	}



	if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN4)

	if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN4)

		pcie_gen = 3;

		pcie_gen = 3;

	else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)

	else if (adev->pm.pcie_gen_mask & CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)
@@ -1261,17 +1272,6 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
		return ret;

		return ret;

	}

	}





	/*

	 * 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_notify_display_change(smu);

	ret = smu_notify_display_change(smu);

	if (ret) {

	if (ret) {

		dev_err(adev->dev, "Failed to notify display change!\n");

		dev_err(adev->dev, "Failed to notify display change!\n");