drm/amd/pm: fix wrong pcie parameter on navi1x

[ Upstream commit 4f74c2dd970611d3ec3bb0d58215e73af5cd7214 ]

fix wrong pcie dpm parameter on navi1x

Fixes: 1a18607c07bb ("drm/amd/pm: override pcie dpm parameters only if it is necessary")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4671
Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Co-developed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 5c5189cf4b0cc0a22bac74a40743ee711cff07f8)
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 0028f10ead42376b47bbea6f0cbbad9b06cfac46..d0fd9537e62365fcec6ca3ca9f80f8ae0d3f80b7 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -2463,8 +2463,8 @@ static int navi10_update_pcie_parameters(struct smu_context *smu,
                                                                        pptable->PcieLaneCount[i] > pcie_width_cap ?
                                                                        pcie_width_cap : pptable->PcieLaneCount[i];
                        smu_pcie_arg = i << 16;
-                       smu_pcie_arg |= pcie_gen_cap << 8;
-                       smu_pcie_arg |= pcie_width_cap;
+                       smu_pcie_arg |= dpm_context->dpm_tables.pcie_table.pcie_gen[i] << 8;
+                       smu_pcie_arg |= dpm_context->dpm_tables.pcie_table.pcie_lane[i];
                        ret = smu_cmn_send_smc_msg_with_param(smu,
                                                        SMU_MSG_OverridePcieParameters,
                                                        smu_pcie_arg,