Skip to contentSkip to conversation

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

PATCH In review Kenneth Feng 3 participants 6 messages Jun 13, 2025 – Jun 16, 2025 2 messages not in the archive

Subsystems (3)
lore
Share & tools
lore

Kenneth Feng

author maintainer
#0 lore raw

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

move the dpm table setting back after featureenablemend due to dependancy.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -11
index 824fcc6dd32a..cf4ac3914b68 100644
@@ -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)
@@ -1739,6 +1728,17 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 		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;
+	}
+
 	smu_init_xgmi_plpd_mode(smu);
 
 	ret = smu_feature_get_enabled_mask(smu, &features_supported);
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH 2/2 drm/amd/pm: set pcie default dpm table when updating pcie dpm parameters

set pcie default dpm table when updating pcie dpm parameters

---
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 104 ++++++++++++++----
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 103 +++++++++++++----
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c  |  45 ++++----
 3 files changed, 186 insertions(+), 66 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +83 -21
index 5a9711e8cf68..257082c03865 100644
@@ -572,8 +572,6 @@ static int smu_v13_0_0_set_default_dpm_table(struct smu_context *smu)
 	PPTable_t *pptable = table_context->driver_pptable;
 	SkuTable_t *skutable = &pptable->SkuTable;
 	struct smu_13_0_dpm_table *dpm_table;
-	struct smu_13_0_pcie_table *pcie_table;
-	uint32_t link_level;
 	int ret = 0;
 
 	/* socclk dpm table setup */
@@ -689,24 +687,6 @@ static int smu_v13_0_0_set_default_dpm_table(struct smu_context *smu)
 		dpm_table->max = dpm_table->dpm_levels[0].value;
 	}
 
-	/* lclk dpm table setup */
-	pcie_table = &dpm_context->dpm_tables.pcie_table;
-	pcie_table->num_of_link_levels = 0;
-	for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
-		if (!skutable->PcieGenSpeed[link_level] &&
-		    !skutable->PcieLaneCount[link_level] &&
-		    !skutable->LclkFreq[link_level])
-			continue;
-
-		pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
-					skutable->PcieGenSpeed[link_level];
-		pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
-					skutable->PcieLaneCount[link_level];
-		pcie_table->clk_freq[pcie_table->num_of_link_levels] =
-					skutable->LclkFreq[link_level];
-		pcie_table->num_of_link_levels++;
-	}
-
 	/* dcefclk dpm table setup */
 	dpm_table = &dpm_context->dpm_tables.dcef_table;
 	if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_DCN_BIT)) {
@@ -3150,6 +3130,88 @@ static int smu_v13_0_0_set_power_limit(struct smu_context *smu,
 	return 0;
 }
 
+static int smu_v13_0_0_update_pcie_parameters(struct smu_context *smu,
+				     uint8_t pcie_gen_cap,
+				     uint8_t pcie_width_cap)
+{
+	struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
+	struct smu_13_0_pcie_table *pcie_table =
+				&dpm_context->dpm_tables.pcie_table;
+	int num_of_levels;
+	uint32_t smu_pcie_arg;
+	uint32_t link_level;
+	struct smu_table_context *table_context = &smu->smu_table;
+	PPTable_t *pptable = table_context->driver_pptable;
+	SkuTable_t *skutable = &pptable->SkuTable;
+	int ret = 0;
+	int i;
+
+	pcie_table->num_of_link_levels = 0;
+
+	for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
+		if (!skutable->PcieGenSpeed[link_level] &&
+		    !skutable->PcieLaneCount[link_level] &&
+		    !skutable->LclkFreq[link_level])
+			continue;
+
+		pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
+					skutable->PcieGenSpeed[link_level];
+		pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
+					skutable->PcieLaneCount[link_level];
+		pcie_table->clk_freq[pcie_table->num_of_link_levels] =
+					skutable->LclkFreq[link_level];
+		pcie_table->num_of_link_levels++;
+	}
+
+	num_of_levels = pcie_table->num_of_link_levels;
+	if (!num_of_levels)
+		return 0;
+
+	if (!(smu->adev->pm.pp_feature & PP_PCIE_DPM_MASK)) {
+		if (pcie_table->pcie_gen[num_of_levels - 1] < pcie_gen_cap)
+			pcie_gen_cap = pcie_table->pcie_gen[num_of_levels - 1];
+
+		if (pcie_table->pcie_lane[num_of_levels - 1] < pcie_width_cap)
+			pcie_width_cap = pcie_table->pcie_lane[num_of_levels - 1];
+
+		/* Force all levels to use the same settings */
+		for (i = 0; i < num_of_levels; i++) {
+			pcie_table->pcie_gen[i] = pcie_gen_cap;
+			pcie_table->pcie_lane[i] = pcie_width_cap;
+			smu_pcie_arg = i << 16;
+			smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+			smu_pcie_arg |= pcie_table->pcie_lane[i];
+
+			ret = smu_cmn_send_smc_msg_with_param(smu,
+								SMU_MSG_OverridePcieParameters,
+								smu_pcie_arg,
+								NULL);
+			if (ret)
+				break;
+		}
+	} else {
+		for (i = 0; i < num_of_levels; i++) {
+			if (pcie_table->pcie_gen[i] > pcie_gen_cap ||
+				pcie_table->pcie_lane[i] > pcie_width_cap) {
+				pcie_table->pcie_gen[i] = pcie_gen_cap;
+				pcie_table->pcie_lane[i] = pcie_width_cap;
+				smu_pcie_arg = i << 16;
+				smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+				smu_pcie_arg |= pcie_table->pcie_lane[i];
+
+				ret = smu_cmn_send_smc_msg_with_param(smu,
+									SMU_MSG_OverridePcieParameters,
+									smu_pcie_arg,
+									NULL);
+				if (ret)
+					break;
+			}
+		}
+	}
+
+	return ret;
+}
+
 static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
 	.get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,
 	.set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,
@@ -3179,7 +3241,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
 	.feature_is_enabled = smu_cmn_feature_is_enabled,
 	.print_clk_levels = smu_v13_0_0_print_clk_levels,
 	.force_clk_levels = smu_v13_0_0_force_clk_levels,
-	.update_pcie_parameters = smu_v13_0_update_pcie_parameters,
+	.update_pcie_parameters = smu_v13_0_0_update_pcie_parameters,
 	.get_thermal_temperature_range = smu_v13_0_0_get_thermal_temperature_range,
 	.register_irq_handler = smu_v13_0_register_irq_handler,
 	.enable_thermal_alert = smu_v13_0_enable_thermal_alert,
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +82 -21

127 lines not on this page · raw message

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +21 -24

67 lines not on this page · raw message

Signature · 1 line
2.34.1

A message that is not in the archive (sent off-list or not yet received): CADnq5_O--6JxQW++XDnnjMbPg8AeOt-uCzLz9fJ6bNUDa_04Bw@mail.gmail.com

author maintainer
#3 lore raw

RE: [PATCH 2/2] drm/amd/pm: set pcie default dpm table when updating pcie dpm parameters

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Alex,
Currently SMU_MSG_OverridePcieParameters is issued after SMU_MSG_EnableAllSmuFeatures is issued.
I confirmed that it violates the pmfw sequence that the pcie dpm parameters should be overwritten before pcie dpm runs.

So I originally made a change to move SMU_MSG_OverridePcieParameters message issuing before SMU_MSG_EnableAllSmuFeatures issuing.
Because the SMU_MSG_OverridePcieParameters processing in driver depends on smu_set_default_dpm_table() output, I moved smu_set_default_dpm_table() before SMU_MSG_EnableAllSmuFeatures is issued as well. Per Lijo, it doesn't work for smu v13.0.6, so I moved smu_set_default_dpm_table() back after SMU_MSG_EnableAllSmuFeatures is issued. Specifically, for smu v13.0.0/7 and smu v14.0.2, I set the default pcie dpm table before SMU_MSG_OverridePcieParameters is issued in order to get the pcie parameters to override the pcie dpm.

Hopefully, it makes sense.

Thanks.

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Saturday, June 14, 2025 12:03 AM
To: Feng, Kenneth <[email protected]>
Cc: [email protected]; Lazar, Lijo <[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/pm: set pcie default dpm table when updating pcie dpm parameters

Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.

Quoted 2 lines · Kenneth Feng

set pcie default dpm table when updating pcie dpm parameters

Is there a reason to integrate this with the updating?

Alex

Quoted 364 lines
---
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 104
++++++++++++++----  .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  |
103 +++++++++++++----  .../drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c  |
45 ++++----
 3 files changed, 186 insertions(+), 66 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +0 -20
index 5a9711e8cf68..257082c03865 100644
@@ -572,8 +572,6 @@ static int smu_v13_0_0_set_default_dpm_table(struct smu_context *smu)
        PPTable_t *pptable = table_context->driver_pptable;
        SkuTable_t *skutable = &pptable->SkuTable;
        struct smu_13_0_dpm_table *dpm_table;
-       struct smu_13_0_pcie_table *pcie_table;
-       uint32_t link_level;
        int ret = 0;
 
        /* socclk dpm table setup */
@@ -689,24 +687,6 @@ static int smu_v13_0_0_set_default_dpm_table(struct smu_context *smu)
                dpm_table->max = dpm_table->dpm_levels[0].value;
        }
 
-       /* lclk dpm table setup */
-       pcie_table = &dpm_context->dpm_tables.pcie_table;
-       pcie_table->num_of_link_levels = 0;
-       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
-               if (!skutable->PcieGenSpeed[link_level] &&
-                   !skutable->PcieLaneCount[link_level] &&
-                   !skutable->LclkFreq[link_level])
-                       continue;
-
-               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
-                                       skutable->PcieGenSpeed[link_level];
-               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
-                                       skutable->PcieLaneCount[link_level];
-               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
-                                       skutable->LclkFreq[link_level];
-               pcie_table->num_of_link_levels++;
-       }
-
        /* dcefclk dpm table setup */
        dpm_table = &dpm_context->dpm_tables.dcef_table;
        if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_DCN_BIT))

{ @@ -3150,6 +3130,88 @@ static int smu_v13_0_0_set_power_limit(struct smu_context *smu,

        return 0;

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +85 -2
+static int smu_v13_0_0_update_pcie_parameters(struct smu_context *smu,
+                                    uint8_t pcie_gen_cap,
+                                    uint8_t pcie_width_cap) {
+       struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
+       struct smu_13_0_pcie_table *pcie_table =
+                               &dpm_context->dpm_tables.pcie_table;
+       int num_of_levels;
+       uint32_t smu_pcie_arg;
+       uint32_t link_level;
+       struct smu_table_context *table_context = &smu->smu_table;
+       PPTable_t *pptable = table_context->driver_pptable;
+       SkuTable_t *skutable = &pptable->SkuTable;
+       int ret = 0;
+       int i;
+
+       pcie_table->num_of_link_levels = 0;
+
+       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
+               if (!skutable->PcieGenSpeed[link_level] &&
+                   !skutable->PcieLaneCount[link_level] &&
+                   !skutable->LclkFreq[link_level])
+                       continue;
+
+               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
+                                       skutable->PcieGenSpeed[link_level];
+               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
+                                       skutable->PcieLaneCount[link_level];
+               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
+                                       skutable->LclkFreq[link_level];
+               pcie_table->num_of_link_levels++;
+       }
+
+       num_of_levels = pcie_table->num_of_link_levels;
+       if (!num_of_levels)
+               return 0;
+
+       if (!(smu->adev->pm.pp_feature & PP_PCIE_DPM_MASK)) {
+               if (pcie_table->pcie_gen[num_of_levels - 1] < pcie_gen_cap)
+                       pcie_gen_cap =
+ pcie_table->pcie_gen[num_of_levels - 1];
+
+               if (pcie_table->pcie_lane[num_of_levels - 1] < pcie_width_cap)
+                       pcie_width_cap =
+ pcie_table->pcie_lane[num_of_levels - 1];
+
+               /* Force all levels to use the same settings */
+               for (i = 0; i < num_of_levels; i++) {
+                       pcie_table->pcie_gen[i] = pcie_gen_cap;
+                       pcie_table->pcie_lane[i] = pcie_width_cap;
+                       smu_pcie_arg = i << 16;
+                       smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+                       smu_pcie_arg |= pcie_table->pcie_lane[i];
+
+                       ret = smu_cmn_send_smc_msg_with_param(smu,
+                                                               SMU_MSG_OverridePcieParameters,
+                                                               smu_pcie_arg,
+                                                               NULL);
+                       if (ret)
+                               break;
+               }
+       } else {
+               for (i = 0; i < num_of_levels; i++) {
+                       if (pcie_table->pcie_gen[i] > pcie_gen_cap ||
+                               pcie_table->pcie_lane[i] > pcie_width_cap) {
+                               pcie_table->pcie_gen[i] = pcie_gen_cap;
+                               pcie_table->pcie_lane[i] = pcie_width_cap;
+                               smu_pcie_arg = i << 16;
+                               smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+                               smu_pcie_arg |=
+ pcie_table->pcie_lane[i];
+
+                               ret = smu_cmn_send_smc_msg_with_param(smu,
+                                                                       SMU_MSG_OverridePcieParameters,
+                                                                       smu_pcie_arg,
+                                                                       NULL);
+                               if (ret)
+                                       break;
+                       }
+               }
+       }
+
+       return ret;
+}
+
 static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
        .get_allowed_feature_mask = smu_v13_0_0_get_allowed_feature_mask,
        .set_default_dpm_table = smu_v13_0_0_set_default_dpm_table,
@@ -3179,7 +3241,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = {
        .feature_is_enabled = smu_cmn_feature_is_enabled,
        .print_clk_levels = smu_v13_0_0_print_clk_levels,
        .force_clk_levels = smu_v13_0_0_force_clk_levels,
-       .update_pcie_parameters = smu_v13_0_update_pcie_parameters,
+       .update_pcie_parameters = smu_v13_0_0_update_pcie_parameters,
        .get_thermal_temperature_range = smu_v13_0_0_get_thermal_temperature_range,
        .register_irq_handler = smu_v13_0_register_irq_handler,
        .enable_thermal_alert = smu_v13_0_enable_thermal_alert, diff
--git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c

b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c index c8f4f6fb4083..e96364856e74 100644

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +0 -20
@@ -579,8 +579,6 @@ static int smu_v13_0_7_set_default_dpm_table(struct smu_context *smu)
        PPTable_t *driver_ppt = smu->smu_table.driver_pptable;
        SkuTable_t *skutable = &driver_ppt->SkuTable;
        struct smu_13_0_dpm_table *dpm_table;
-       struct smu_13_0_pcie_table *pcie_table;
-       uint32_t link_level;
        int ret = 0;
 
        /* socclk dpm table setup */
@@ -687,24 +685,6 @@ static int smu_v13_0_7_set_default_dpm_table(struct smu_context *smu)
                dpm_table->max = dpm_table->dpm_levels[0].value;
        }
 
-       /* lclk dpm table setup */
-       pcie_table = &dpm_context->dpm_tables.pcie_table;
-       pcie_table->num_of_link_levels = 0;
-       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
-               if (!skutable->PcieGenSpeed[link_level] &&
-                   !skutable->PcieLaneCount[link_level] &&
-                   !skutable->LclkFreq[link_level])
-                       continue;
-
-               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
-                                       skutable->PcieGenSpeed[link_level];
-               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
-                                       skutable->PcieLaneCount[link_level];
-               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
-                                       skutable->LclkFreq[link_level];
-               pcie_table->num_of_link_levels++;
-       }
-
        /* dcefclk dpm table setup */
        dpm_table = &dpm_context->dpm_tables.dcef_table;
        if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_DCN_BIT))

{ @@ -2739,6 +2719,87 @@ static int smu_v13_0_7_set_power_limit(struct smu_context *smu,

        return 0;

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +84 -2
+static int smu_v13_0_7_update_pcie_parameters(struct smu_context *smu,
+                                    uint8_t pcie_gen_cap,
+                                    uint8_t pcie_width_cap) {
+       struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
+       struct smu_13_0_pcie_table *pcie_table =
+                               &dpm_context->dpm_tables.pcie_table;
+       int num_of_levels;
+       int link_level;
+       uint32_t smu_pcie_arg;
+       struct smu_table_context *table_context = &smu->smu_table;
+       PPTable_t *pptable = table_context->driver_pptable;
+       SkuTable_t *skutable = &pptable->SkuTable;
+       int ret = 0;
+       int i;
+
+       pcie_table->num_of_link_levels = 0;
+       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
+               if (!skutable->PcieGenSpeed[link_level] &&
+                   !skutable->PcieLaneCount[link_level] &&
+                   !skutable->LclkFreq[link_level])
+                       continue;
+
+               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
+                                       skutable->PcieGenSpeed[link_level];
+               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
+                                       skutable->PcieLaneCount[link_level];
+               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
+                                       skutable->LclkFreq[link_level];
+               pcie_table->num_of_link_levels++;
+       }
+
+       num_of_levels = pcie_table->num_of_link_levels;
+       if (!num_of_levels)
+               return 0;
+
+       if (!(smu->adev->pm.pp_feature & PP_PCIE_DPM_MASK)) {
+               if (pcie_table->pcie_gen[num_of_levels - 1] < pcie_gen_cap)
+                       pcie_gen_cap =
+ pcie_table->pcie_gen[num_of_levels - 1];
+
+               if (pcie_table->pcie_lane[num_of_levels - 1] < pcie_width_cap)
+                       pcie_width_cap =
+ pcie_table->pcie_lane[num_of_levels - 1];
+
+               /* Force all levels to use the same settings */
+               for (i = 0; i < num_of_levels; i++) {
+                       pcie_table->pcie_gen[i] = pcie_gen_cap;
+                       pcie_table->pcie_lane[i] = pcie_width_cap;
+                       smu_pcie_arg = i << 16;
+                       smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+                       smu_pcie_arg |= pcie_table->pcie_lane[i];
+
+                       ret = smu_cmn_send_smc_msg_with_param(smu,
+                                                               SMU_MSG_OverridePcieParameters,
+                                                               smu_pcie_arg,
+                                                               NULL);
+                       if (ret)
+                               break;
+               }
+       } else {
+               for (i = 0; i < num_of_levels; i++) {
+                       if (pcie_table->pcie_gen[i] > pcie_gen_cap ||
+                               pcie_table->pcie_lane[i] > pcie_width_cap) {
+                               pcie_table->pcie_gen[i] = pcie_gen_cap;
+                               pcie_table->pcie_lane[i] = pcie_width_cap;
+                               smu_pcie_arg = i << 16;
+                               smu_pcie_arg |= pcie_table->pcie_gen[i] << 8;
+                               smu_pcie_arg |=
+ pcie_table->pcie_lane[i];
+
+                               ret = smu_cmn_send_smc_msg_with_param(smu,
+                                                                       SMU_MSG_OverridePcieParameters,
+                                                                       smu_pcie_arg,
+                                                                       NULL);
+                               if (ret)
+                                       break;
+                       }
+               }
+       }
+
+       return ret;
+}
+
 static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
        .get_allowed_feature_mask = smu_v13_0_7_get_allowed_feature_mask,
        .set_default_dpm_table = smu_v13_0_7_set_default_dpm_table,
@@ -2768,7 +2829,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
        .feature_is_enabled = smu_cmn_feature_is_enabled,
        .print_clk_levels = smu_v13_0_7_print_clk_levels,
        .force_clk_levels = smu_v13_0_7_force_clk_levels,
-       .update_pcie_parameters = smu_v13_0_update_pcie_parameters,
+       .update_pcie_parameters = smu_v13_0_7_update_pcie_parameters,
        .get_thermal_temperature_range = smu_v13_0_7_get_thermal_temperature_range,
        .register_irq_handler = smu_v13_0_register_irq_handler,
        .enable_thermal_alert = smu_v13_0_enable_thermal_alert, diff
--git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c

b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c index d5a4abd60d06..581a4e59130a 100644

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +0 -23
@@ -502,8 +502,6 @@ static int smu_v14_0_2_set_default_dpm_table(struct smu_context *smu)
        PPTable_t *pptable = table_context->driver_pptable;
        SkuTable_t *skutable = &pptable->SkuTable;
        struct smu_14_0_dpm_table *dpm_table;
-       struct smu_14_0_pcie_table *pcie_table;
-       uint32_t link_level;
        int ret = 0;
 
        /* socclk dpm table setup */
@@ -619,27 +617,6 @@ static int smu_v14_0_2_set_default_dpm_table(struct smu_context *smu)
                dpm_table->max = dpm_table->dpm_levels[0].value;
        }
 
-       /* lclk dpm table setup */
-       pcie_table = &dpm_context->dpm_tables.pcie_table;
-       pcie_table->num_of_link_levels = 0;
-       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
-               if (!skutable->PcieGenSpeed[link_level] &&
-                   !skutable->PcieLaneCount[link_level] &&
-                   !skutable->LclkFreq[link_level])
-                       continue;
-
-               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
-                                       skutable->PcieGenSpeed[link_level];
-               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
-                                       skutable->PcieLaneCount[link_level];
-               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
-                                       skutable->LclkFreq[link_level];
-               pcie_table->num_of_link_levels++;
-
-               if (link_level == 0)
-                       link_level++;
-       }
-
        /* dcefclk dpm table setup */
        dpm_table = &dpm_context->dpm_tables.dcef_table;
        if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_DCN_BIT))

{ @@ -1487,11 +1464,31 @@ static int smu_v14_0_2_update_pcie_parameters(struct smu_context *smu,

        struct smu_14_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
        struct smu_14_0_pcie_table *pcie_table =
                                &dpm_context->dpm_tables.pcie_table;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +21 -2
-       int num_of_levels = pcie_table->num_of_link_levels;
+       int num_of_levels;
        uint32_t smu_pcie_arg;
+       uint32_t link_level;
+       struct smu_table_context *table_context = &smu->smu_table;
+       PPTable_t *pptable = table_context->driver_pptable;
+       SkuTable_t *skutable = &pptable->SkuTable;
        int ret = 0;
        int i;
 
+       pcie_table->num_of_link_levels = 0;
+       for (link_level = 0; link_level < NUM_LINK_LEVELS; link_level++) {
+               if (!skutable->PcieGenSpeed[link_level] &&
+                   !skutable->PcieLaneCount[link_level] &&
+                   !skutable->LclkFreq[link_level])
+                       continue;
+
+               pcie_table->pcie_gen[pcie_table->num_of_link_levels] =
+                                       skutable->PcieGenSpeed[link_level];
+               pcie_table->pcie_lane[pcie_table->num_of_link_levels] =
+                                       skutable->PcieLaneCount[link_level];
+               pcie_table->clk_freq[pcie_table->num_of_link_levels] =
+                                       skutable->LclkFreq[link_level];
+               pcie_table->num_of_link_levels++;
+       }
+       num_of_levels = pcie_table->num_of_link_levels;
        if (!num_of_levels)
                return 0;
 
--

2.34.1

#4 lore raw
In reply to Kenneth Feng
Quoted 2 lines · Kenneth Feng

move the dpm table setting back after featureenablemend due to dependancy.

What is the dependency? Can you provide more details?

Alex

Quoted 49 lines
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -12
index 824fcc6dd32a..cf4ac3914b68 100644
@@ -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)
@@ -1739,6 +1728,17 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                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;
+       }
+
        smu_init_xgmi_plpd_mode(smu);
 
        ret = smu_feature_get_enabled_mask(smu, &features_supported);
--

2.34.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by
#6 lore raw
Quoted 6 lines · Lijo
Quoted 2 lines · Alex Deucher
Quoted 1 line · Kenneth Feng
Quoted 8 lines
Quoted 4 lines
Quoted 1 line

move the dpm table setting back after featureenablemend due to dependancy.

What is the dependency? Can you provide more details?

For SMUv13.0.6, there is no pptable. We get all the frequency tables from FW during this callback. Those frequency tables are available through FW metrics and it needs DPM to be enabled.

Thanks. Please add that to the commit message. With that, the patch is:

Quoted 56 lines

Thanks,
Lijo

Quoted 51 lines

Alex

Quoted 49 lines
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -12
index 824fcc6dd32a..cf4ac3914b68 100644
@@ -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)
@@ -1739,6 +1728,17 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                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;
+       }
+
        smu_init_xgmi_plpd_mode(smu);
 
        ret = smu_feature_get_enabled_mask(smu, &features_supported);
--

2.34.1

#7 lore raw
In reply to Kenneth Feng
Quoted 34 lines · Kenneth Feng

move the dpm table setting back after featureenablemend due to dependancy.

---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -11
index 824fcc6dd32a..cf4ac3914b68 100644
@@ -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)
@@ -1739,6 +1728,17 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 		return ret;
 	}
 
+	/*

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c static int smu_smc_hw_setup(struct smu_context *smu) · line 1741

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +10 -0
+	 * 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;
+	}
+

As was in the original code, please move this after -

if (!smu_is_dpm_running(smu))

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

This point completes all the diagnostic messages related to DPM feature enable stage. That helps to check if any issue happened before fetching tables from firmware.

Thanks,
Lijo

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -0
 	smu_init_xgmi_plpd_mode(smu);
 
 	ret = smu_feature_get_enabled_mask(smu, &features_supported);