Skip to contentSkip to conversation

drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

PATCH Superseded Li Ma 2 participants 4 messages Jul 1, 2024 – Jul 2, 2024

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Li Ma

author
#0 lore raw

PATCH v2 1/1 drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c  | 138 +++++++++++++++++-
 1 file changed, 131 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +131 -7
index 3a9d58c036ea..72fca481dec1 100644
@@ -65,6 +65,10 @@
 
 #define SMU_MALL_PG_CONFIG_DEFAULT SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ON
 
+#define SMU_14_0_0_UMD_PSTATE_GFXCLK			700
+#define SMU_14_0_0_UMD_PSTATE_SOCCLK			678
+#define SMU_14_0_0_UMD_PSTATE_FCLK			1800
+
 #define FEATURE_MASK(feature) (1ULL << feature)
 #define SMC_DPM_FEATURE ( \
 	FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \
@@ -818,9 +822,11 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
 			break;
 		case SMU_MCLK:
 		case SMU_UCLK:
-		case SMU_FCLK:
 			max_dpm_level = 0;
 			break;
+		case SMU_FCLK:
+			max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+			break;
 		case SMU_SOCCLK:
 			max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
 			break;
@@ -855,7 +861,7 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
 			min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
 			break;
 		case SMU_FCLK:
-			min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+			min_dpm_level = 0;
 			break;
 		case SMU_SOCCLK:
 			min_dpm_level = 0;
@@ -936,9 +942,11 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
 			break;
 		case SMU_MCLK:
 		case SMU_UCLK:
-		case SMU_FCLK:
 			max_dpm_level = 0;
 			break;
+		case SMU_FCLK:
+			max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+			break;
 		case SMU_SOCCLK:
 			max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
 			break;
@@ -969,7 +977,7 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
 			min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
 			break;
 		case SMU_FCLK:
-			min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+			min_dpm_level = 0;
 			break;
 		case SMU_SOCCLK:
 			min_dpm_level = 0;
@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,
 	return ret;
 }
 
-static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
+static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context *smu,
+					enum amd_dpm_forced_level level,
+					enum smu_clk_type clk_type,
+					uint32_t *min_clk,
+					uint32_t *max_clk)
+{
+	uint32_t clk_limit = 0;
+	int ret = 0;
+
+	switch (clk_type) {
+	case SMU_GFXCLK:
+	case SMU_SCLK:
+		clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, NULL, &clk_limit);
+		else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, &clk_limit, NULL);
+		break;
+	case SMU_SOCCLK:
+		clk_limit = SMU_14_0_0_UMD_PSTATE_SOCCLK;
+		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK, NULL, &clk_limit);
+		break;
+	case SMU_FCLK:
+		clk_limit = SMU_14_0_0_UMD_PSTATE_FCLK;
+		if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, NULL, &clk_limit);
+		else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, &clk_limit, NULL);
+		break;
+	case SMU_VCLK:
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK, NULL, &clk_limit);
+		break;
+	case SMU_VCLK1:
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1, NULL, &clk_limit);
+		break;
+	case SMU_DCLK:
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK, NULL, &clk_limit);
+		break;
+	case SMU_DCLK1:
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1, NULL, &clk_limit);
+		break;
+	default:
+		ret = -EINVAL;
+		break;
+	}
+	*min_clk = *max_clk = clk_limit;
+	return ret;
+}
+
+static int smu_v14_0_common_set_performance_level(struct smu_context *smu,
 					     enum amd_dpm_forced_level level)
 {
 	struct amdgpu_device *adev = smu->adev;
 	uint32_t sclk_min = 0, sclk_max = 0;
 	uint32_t fclk_min = 0, fclk_max = 0;
 	uint32_t socclk_min = 0, socclk_max = 0;
+	uint32_t vclk_min = 0, vclk_max = 0;
+	uint32_t dclk_min = 0, dclk_max = 0;
+	uint32_t vclk1_min = 0, vclk1_max = 0;
+	uint32_t dclk1_min = 0, dclk1_max = 0;
 	int ret = 0;
 
 	switch (level) {
@@ -1282,28 +1344,54 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, NULL, &sclk_max);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, NULL, &fclk_max);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK, NULL, &socclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK, NULL, &vclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK, NULL, &dclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1, NULL, &vclk1_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1, NULL, &dclk1_max);
 		sclk_min = sclk_max;
 		fclk_min = fclk_max;
 		socclk_min = socclk_max;
+		vclk_min = vclk_max;
+		dclk_min = dclk_max;
+		vclk1_min = vclk1_max;
+		dclk1_min = dclk1_max;
 		break;
 	case AMD_DPM_FORCED_LEVEL_LOW:
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, &sclk_min, NULL);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, &fclk_min, NULL);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK, &socclk_min, NULL);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK, &vclk_min, NULL);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK, &dclk_min, NULL);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1, &vclk1_min, NULL);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1, &dclk1_min, NULL);
 		sclk_max = sclk_min;
 		fclk_max = fclk_min;
 		socclk_max = socclk_min;
+		vclk_max = vclk_min;
+		dclk_max = dclk_min;
+		vclk1_max = vclk1_min;
+		dclk1_max = dclk1_min;
 		break;
 	case AMD_DPM_FORCED_LEVEL_AUTO:
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, &sclk_min, &sclk_max);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, &fclk_min, &fclk_max);
 		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK, &socclk_min, &socclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK, &vclk_min, &vclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK, &dclk_min, &dclk_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1, &vclk1_min, &vclk1_max);
+		smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1, &dclk1_min, &dclk1_max);
 		break;
 	case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
-		/* Temporarily do nothing since the optimal clocks haven't been provided yet */
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_SCLK, &sclk_min, &sclk_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_FCLK, &fclk_min, &fclk_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_SOCCLK, &socclk_min, &socclk_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_VCLK, &vclk_min, &vclk_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_DCLK, &dclk_min, &dclk_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_VCLK1, &vclk1_min, &vclk1_max);
+		smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_DCLK1, &dclk1_min, &dclk1_max);
 		break;
 	case AMD_DPM_FORCED_LEVEL_MANUAL:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:
@@ -1343,6 +1431,42 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
 			return ret;
 	}
 
+	if (vclk_min && vclk_max) {
+		ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+							      SMU_VCLK,
+							      vclk_min,
+							      vclk_max);
+		if (ret)
+			return ret;
+	}
+
+	if (vclk1_min && vclk1_max) {
+		ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+							      SMU_VCLK1,
+							      vclk1_min,
+							      vclk1_max);
+		if (ret)
+			return ret;
+	}
+
+	if (dclk_min && dclk_max) {
+		ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+							      SMU_DCLK,
+							      dclk_min,
+							      dclk_max);
+		if (ret)
+			return ret;
+	}
+
+	if (dclk1_min && dclk1_max) {
+		ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+							      SMU_DCLK1,
+							      dclk1_min,
+							      dclk1_max);
+		if (ret)
+			return ret;
+	}
+
 	return ret;
 }
 
@@ -1520,7 +1644,7 @@ static const struct pptable_funcs smu_v14_0_0_ppt_funcs = {
 	.od_edit_dpm_table = smu_v14_0_od_edit_dpm_table,
 	.print_clk_levels = smu_v14_0_0_print_clk_levels,
 	.force_clk_levels = smu_v14_0_0_force_clk_levels,
-	.set_performance_level = smu_v14_0_0_set_performance_level,
+	.set_performance_level = smu_v14_0_common_set_performance_level,
 	.set_fine_grain_gfx_freq_parameters = smu_v14_0_common_set_fine_grain_gfx_freq_parameters,
 	.set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu,
 	.dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,
Signature · 1 line
2.25.1
#1 lore raw

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Li,

Quoted 247 lines

-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 6:44 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c  | 138
+++++++++++++++++-
 1 file changed, 131 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
index 3a9d58c036ea..72fca481dec1 100644
@@ -65,6 +65,10 @@
 
 #define SMU_MALL_PG_CONFIG_DEFAULT

SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ON

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+#define SMU_14_0_0_UMD_PSTATE_GFXCLK                 700
+#define SMU_14_0_0_UMD_PSTATE_SOCCLK                 678
+#define SMU_14_0_0_UMD_PSTATE_FCLK                   1800
+
 #define FEATURE_MASK(feature) (1ULL << feature)  #define
SMC_DPM_FEATURE ( \
      FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -818,9 +822,11 @@
static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
                      break;
              case SMU_MCLK:
              case SMU_UCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -2
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     break;
              case SMU_SOCCLK:
                      max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
                      break;
@@ -855,7 +861,7 @@ static int
 smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
                      break;
              case SMU_FCLK:
-                     min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -1
@@ -936,9 +942,11 @@ static int
 smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
                      break;
              case SMU_MCLK:
              case SMU_UCLK:
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     break;
              case SMU_SOCCLK:
                      max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
                      break;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
@@ -969,7 +977,7 @@ static int
 smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
                      break;
              case SMU_FCLK:
-                     min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +38 -1
@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(struct
 smu_context *smu,
      return ret;
 }
 
-static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
+static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context
 *smu,
+                                     enum amd_dpm_forced_level level,
+                                     enum smu_clk_type clk_type,
+                                     uint32_t *min_clk,
+                                     uint32_t *max_clk)
+{
+     uint32_t clk_limit = 0;
+     int ret = 0;
+
+     switch (clk_type) {
+     case SMU_GFXCLK:
+     case SMU_SCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 NULL, &clk_limit);
+             else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 &clk_limit, NULL);
+             break;
+     case SMU_SOCCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_SOCCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,
 SMU_SOCCLK, NULL, &clk_limit);
+             break;
+     case SMU_FCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_FCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 NULL, &clk_limit);
+             else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 &clk_limit, NULL);
+             break;
+     case SMU_VCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 NULL, &clk_limit);
+             break;
+     case SMU_VCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 NULL, &clk_limit);
+             break;
+     case SMU_DCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_DCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +33 -0
+             break;
+     default:
+             ret = -EINVAL;
+             break;
+     }
+     *min_clk = *max_clk = clk_limit;
+     return ret;
+}
+
+static int smu_v14_0_common_set_performance_level(struct smu_context
+*smu,
                                           enum amd_dpm_forced_level level)  {
      struct amdgpu_device *adev = smu->adev;
      uint32_t sclk_min = 0, sclk_max = 0;
      uint32_t fclk_min = 0, fclk_max = 0;
      uint32_t socclk_min = 0, socclk_max = 0;
+     uint32_t vclk_min = 0, vclk_max = 0;
+     uint32_t dclk_min = 0, dclk_max = 0;
+     uint32_t vclk1_min = 0, vclk1_max = 0;
+     uint32_t dclk1_min = 0, dclk1_max = 0;
      int ret = 0;
 
      switch (level) {
@@ -1282,28 +1344,54 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 NULL, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 NULL, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
 NULL, &socclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 NULL, &vclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
 NULL, &dclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 NULL, &vclk1_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
 NULL,
+&dclk1_max);
              sclk_min = sclk_max;
              fclk_min = fclk_max;
              socclk_min = socclk_max;
+             vclk_min = vclk_max;
+             dclk_min = dclk_max;
+             vclk1_min = vclk1_max;
+             dclk1_min = dclk1_max;
              break;
      case AMD_DPM_FORCED_LEVEL_LOW:
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 &sclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 &fclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
 &socclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 &vclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
 &dclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 &vclk1_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
 &dclk1_min,
+NULL);
              sclk_max = sclk_min;
              fclk_max = fclk_min;
              socclk_max = socclk_min;
+             vclk_max = vclk_min;
+             dclk_max = dclk_min;
+             vclk1_max = vclk1_min;
+             dclk1_max = dclk1_min;
              break;
      case AMD_DPM_FORCED_LEVEL_AUTO:
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
&sclk_min, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
&fclk_min, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,

&socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
&dclk1_min,

+&dclk1_max);
              break;
      case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:

- /* Temporarily do nothing since the optimal clocks haven't been
provided yet */
+ smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_SCLK,
&sclk_min, &sclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_FCLK,
&fclk_min, &fclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_SOCCLK, &socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_VCLK,

Quoted 8 lines

&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_DCLK,
&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level, SMU_VCLK1,
&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_DCLK1,
+&dclk1_min, &dclk1_max);

We should not need to set the VCLK1 and DCLK1 for SMU v14.0.0.

Tim

Quoted 60 lines
              break;
      case AMD_DPM_FORCED_LEVEL_MANUAL:
      case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +37 -1
@@ -1343,6 +1431,42 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
                      return ret;
      }
 
+     if (vclk_min && vclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_VCLK,
+                                                           vclk_min,
+                                                           vclk_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (vclk1_min && vclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_VCLK1,
+                                                           vclk1_min,
+                                                           vclk1_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk_min && dclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_DCLK,
+                                                           dclk_min,
+                                                           dclk_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk1_min && dclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_DCLK1,
+                                                           dclk1_min,
+                                                           dclk1_max);
+             if (ret)
+                     return ret;
+     }
+
      return ret;
 }
@@ -1520,7 +1644,7 @@ static const struct pptable_funcs
 smu_v14_0_0_ppt_funcs = {
      .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table,
      .print_clk_levels = smu_v14_0_0_print_clk_levels,
      .force_clk_levels = smu_v14_0_0_force_clk_levels,
-     .set_performance_level = smu_v14_0_0_set_performance_level,
+     .set_performance_level = smu_v14_0_common_set_performance_level,
      .set_fine_grain_gfx_freq_parameters =
 smu_v14_0_common_set_fine_grain_gfx_freq_parameters,
      .set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu,
      .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,

--
2.25.1

author
#2 lore raw

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Tim,

Quoted 273 lines

-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Monday, July 1, 2024 7:32 PM
To: Ma, Li <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>
Subject: RE: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Li,

Quoted 100 lines

-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 6:44 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c  | 138
+++++++++++++++++-
 1 file changed, 131 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
index 3a9d58c036ea..72fca481dec1 100644
@@ -65,6 +65,10 @@
 
 #define SMU_MALL_PG_CONFIG_DEFAULT

SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ON

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+#define SMU_14_0_0_UMD_PSTATE_GFXCLK                 700
+#define SMU_14_0_0_UMD_PSTATE_SOCCLK                 678
+#define SMU_14_0_0_UMD_PSTATE_FCLK                   1800
+
 #define FEATURE_MASK(feature) (1ULL << feature)  #define
SMC_DPM_FEATURE ( \
      FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -818,9 +822,11 @@
static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
                      break;
              case SMU_MCLK:
              case SMU_UCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -2
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     break;
              case SMU_SOCCLK:
                      max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
                      break;
@@ -855,7 +861,7 @@ static int
 smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
                      break;
              case SMU_FCLK:
-                     min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -1
@@ -936,9 +942,11 @@ static int
 smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
                      break;
              case SMU_MCLK:
              case SMU_UCLK:
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     break;
              case SMU_SOCCLK:
                      max_dpm_level = clk_table->NumSocClkLevelsEnabled - 1;
                      break;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
@@ -969,7 +977,7 @@ static int
 smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level = clk_table->NumMemPstatesEnabled - 1;
                      break;
              case SMU_FCLK:
-                     min_dpm_level = clk_table->NumFclkLevelsEnabled - 1;
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +5 -1
@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(struct
 smu_context *smu,
      return ret;
 }
 
-static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
+static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context
 *smu,
+                                     enum amd_dpm_forced_level level,
+                                     enum smu_clk_type clk_type,
+                                     uint32_t *min_clk,
+                                     uint32_t *max_clk)

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct · line 1295

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +10 -0
+{
+     uint32_t clk_limit = 0;
+     int ret = 0;
+
+     switch (clk_type) {
+     case SMU_GFXCLK:
+     case SMU_SCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SCLK,

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct · line 1298

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2 -0
 NULL, &clk_limit);
+             else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SCLK,

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,

Quoted 12 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +10 -0
 &clk_limit, NULL);
+             break;
+     case SMU_SOCCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_SOCCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,
 SMU_SOCCLK, NULL, &clk_limit);
+             break;
+     case SMU_FCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_FCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_FCLK,

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct · line 1313

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2 -0
 NULL, &clk_limit);
+             else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)
+                     smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_FCLK,

Quoted 110 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +9 -0
 &clk_limit, NULL);
+             break;
+     case SMU_VCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 NULL, &clk_limit);
+             break;
+     case SMU_VCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 NULL, &clk_limit);
+             break;
+     case SMU_DCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_DCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +33 -0
+             break;
+     default:
+             ret = -EINVAL;
+             break;
+     }
+     *min_clk = *max_clk = clk_limit;
+     return ret;
+}
+
+static int smu_v14_0_common_set_performance_level(struct smu_context
+*smu,
                                           enum amd_dpm_forced_level level)  {
      struct amdgpu_device *adev = smu->adev;
      uint32_t sclk_min = 0, sclk_max = 0;
      uint32_t fclk_min = 0, fclk_max = 0;
      uint32_t socclk_min = 0, socclk_max = 0;
+     uint32_t vclk_min = 0, vclk_max = 0;
+     uint32_t dclk_min = 0, dclk_max = 0;
+     uint32_t vclk1_min = 0, vclk1_max = 0;
+     uint32_t dclk1_min = 0, dclk1_max = 0;
      int ret = 0;
 
      switch (level) {
@@ -1282,28 +1344,54 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 NULL, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 NULL, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
 NULL, &socclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 NULL, &vclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
 NULL, &dclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 NULL, &vclk1_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
 NULL,
+&dclk1_max);
              sclk_min = sclk_max;
              fclk_min = fclk_max;
              socclk_min = socclk_max;
+             vclk_min = vclk_max;
+             dclk_min = dclk_max;
+             vclk1_min = vclk1_max;
+             dclk1_min = dclk1_max;
              break;
      case AMD_DPM_FORCED_LEVEL_LOW:
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
 &sclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
 &fclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
 &socclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
 &vclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
 &dclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
 &vclk1_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
 &dclk1_min,
+NULL);
              sclk_max = sclk_min;
              fclk_max = fclk_min;
              socclk_max = socclk_min;
+             vclk_max = vclk_min;
+             dclk_max = dclk_min;
+             vclk1_max = vclk1_min;
+             dclk1_max = dclk1_min;
              break;
      case AMD_DPM_FORCED_LEVEL_AUTO:
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,
&sclk_min, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK,
&fclk_min, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,

&socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK,
&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,
&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_VCLK1,
&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,
&dclk1_min,

+&dclk1_max);
              break;
      case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
Quoted 3 lines

- /* Temporarily do nothing since the optimal clocks haven't been
provided yet */
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_SCLK,

Quoted 2 lines

&sclk_min, &sclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_FCLK,

Quoted 4 lines

&fclk_min, &fclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_SOCCLK, &socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_VCLK,

Quoted 2 lines

&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_DCLK,

Quoted 2 lines

&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_VCLK1,

Quoted 8 lines
Quoted 4 lines

&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_DCLK1,
+&dclk1_min, &dclk1_max);

We should not need to set the VCLK1 and DCLK1 for SMU v14.0.0.

Tim

Li: Sorry, the change in V1 is missing here.
There is a "else if" condition in smu_v14_0_common_get_dpm_ultimate_freq:
+ if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1))

                smu_v14_0_1_get_dpm_ultimate_freq(smu, clk_type, min, max);

+ else if (clk_type != SMU_VCLK1 && clk_type != SMU_DCLK1)
+ smu_v14_0_0_get_dpm_ultimate_freq(smu, clk_type, min, max);
This will avoid to set VCLK1 and DCLK1 for SMU v14.0.0 and v14.0.4
Or using smu version as condition is more reasonable?

Thanks,
Li

Quoted 62 lines
Quoted 48 lines
              break;
      case AMD_DPM_FORCED_LEVEL_MANUAL:
      case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +36 -0
@@ -1343,6 +1431,42 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
                      return ret;
      }
 
+     if (vclk_min && vclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_VCLK,
+                                                           vclk_min,
+                                                           vclk_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (vclk1_min && vclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_VCLK1,
+                                                           vclk1_min,
+                                                           vclk1_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk_min && dclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_DCLK,
+                                                           dclk_min,
+                                                           dclk_max);
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk1_min && dclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+                                                           SMU_DCLK1,
+                                                           dclk1_min,
+                                                           dclk1_max);
+             if (ret)
+                     return ret;
+     }
+
      return ret;
 }

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static const struct pptable_funcs · line 1648

Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
@@ -1520,7 +1644,7 @@ static const struct pptable_funcs
 smu_v14_0_0_ppt_funcs = {
      .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table,
      .print_clk_levels = smu_v14_0_0_print_clk_levels,
      .force_clk_levels = smu_v14_0_0_force_clk_levels,
-     .set_performance_level = smu_v14_0_0_set_performance_level,
+     .set_performance_level =

smu_v14_0_common_set_performance_level,

Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
      .set_fine_grain_gfx_freq_parameters =
 smu_v14_0_common_set_fine_grain_gfx_freq_parameters,
      .set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu,
      .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,

--
2.25.1

#3 lore raw

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Li,

Quoted 347 lines

-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 9:14 PM
To: Huang, Tim <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>
Subject: RE: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Tim,

Quoted 47 lines

-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Monday, July 1, 2024 7:32 PM
To: Ma, Li <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>
Subject: RE: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

[AMD Official Use Only - AMD Internal Distribution Only]

Hi Li,

Quoted 34 lines

-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 6:44 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH v2] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1

This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c  | 138
+++++++++++++++++-
 1 file changed, 131 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
index 3a9d58c036ea..72fca481dec1 100644
@@ -65,6 +65,10 @@
 
 #define SMU_MALL_PG_CONFIG_DEFAULT

SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ON

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+#define SMU_14_0_0_UMD_PSTATE_GFXCLK                 700
+#define SMU_14_0_0_UMD_PSTATE_SOCCLK                 678
+#define SMU_14_0_0_UMD_PSTATE_FCLK                   1800
+
 #define FEATURE_MASK(feature) (1ULL << feature)  #define
SMC_DPM_FEATURE ( \
      FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -818,9 +822,11

@@

Quoted 9 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,

Quoted 9 lines

static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,

                      break;
              case SMU_MCLK:
              case SMU_UCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2 -1
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level =

clk_table->NumFclkLevelsEnabled - 1;

Quoted 3 lines
Quoted 3 lines

+ break;
case SMU_SOCCLK:
max_dpm_level =

clk_table->NumSocClkLevelsEnabled - 1;

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 862

Quoted 4 lines
                      break;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
@@ -855,7 +861,7 @@ static int
 smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level =

clk_table->NumMemPstatesEnabled - 1;

Quoted 3 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -1
                      break;
              case SMU_FCLK:
-                     min_dpm_level =

clk_table->NumFclkLevelsEnabled - 1;

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0; @@ -936,9 +942,11 @@

static

Quoted 9 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,

Quoted 9 lines

int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,

                      break;
              case SMU_MCLK:
              case SMU_UCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2 -1
-             case SMU_FCLK:
                      max_dpm_level = 0;
                      break;
+             case SMU_FCLK:
+                     max_dpm_level =

clk_table->NumFclkLevelsEnabled - 1;

Quoted 3 lines
Quoted 3 lines

+ break;
case SMU_SOCCLK:
max_dpm_level =

clk_table->NumSocClkLevelsEnabled - 1;

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 978

Quoted 4 lines
                      break;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
@@ -969,7 +977,7 @@ static int
 smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,
                      min_dpm_level =

clk_table->NumMemPstatesEnabled - 1;

Quoted 3 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -1
                      break;
              case SMU_FCLK:
-                     min_dpm_level =

clk_table->NumFclkLevelsEnabled - 1;

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+                     min_dpm_level = 0;
                      break;
              case SMU_SOCCLK:
                      min_dpm_level = 0; @@ -1268,13 +1276,67

@@

Quoted 10 lines
Quoted 10 lines

static int smu_v14_0_0_force_clk_levels(struct
smu_context *smu,

      return ret;

}

-static int smu_v14_0_0_set_performance_level(struct smu_context *smu,
+static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context *smu,
+ enum amd_dpm_forced_level

level,

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+                                     enum smu_clk_type clk_type,
+                                     uint32_t *min_clk,
+                                     uint32_t *max_clk) {
+     uint32_t clk_limit = 0;
Quoted 8 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu, · line 1328

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +8 -0
+     int ret = 0;
+
+     switch (clk_type) {
+     case SMU_GFXCLK:
+     case SMU_SCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+

smu_v14_0_common_get_dpm_ultimate_freq(smu,

Quoted 3 lines

SMU_SCLK,

Quoted 2 lines

NULL, &clk_limit);
+ else if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)

Quoted 1 line
Quoted 1 line

+

smu_v14_0_common_get_dpm_ultimate_freq(smu,

Quoted 7 lines

SMU_SCLK,

Quoted 6 lines

&clk_limit, NULL);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +5 -0
+             break;
+     case SMU_SOCCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_SOCCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+

smu_v14_0_common_get_dpm_ultimate_freq(smu,

Quoted 6 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu, · line 1328

Quoted 6 lines

SMU_SOCCLK, NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +5 -0
+             break;
+     case SMU_FCLK:
+             clk_limit = SMU_14_0_0_UMD_PSTATE_FCLK;
+             if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+

smu_v14_0_common_get_dpm_ultimate_freq(smu,

Quoted 3 lines

SMU_FCLK,

Quoted 2 lines

NULL, &clk_limit);
+ else if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)

Quoted 1 line
Quoted 1 line

+

smu_v14_0_common_get_dpm_ultimate_freq(smu,

Quoted 5 lines

SMU_FCLK,

Quoted 4 lines

&clk_limit, NULL);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_VCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK,

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,

Quoted 4 lines

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_VCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK1,

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,

Quoted 4 lines

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_DCLK:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK,

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,

Quoted 4 lines

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+             break;
+     case SMU_DCLK1:
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK1,

Quoted 5 lines
Quoted 5 lines

NULL, &clk_limit);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+             break;
+     default:
+             ret = -EINVAL;
+             break;
Quoted 8 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +7 -0
+     }
+     *min_clk = *max_clk = clk_limit;
+     return ret;
+}
+
+static int smu_v14_0_common_set_performance_level(struct
+smu_context *smu,
                                           enum

amd_dpm_forced_level level) {

Quoted 10 lines
Quoted 10 lines
      struct amdgpu_device *adev = smu->adev;
      uint32_t sclk_min = 0, sclk_max = 0;
      uint32_t fclk_min = 0, fclk_max = 0;
      uint32_t socclk_min = 0, socclk_max = 0;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+     uint32_t vclk_min = 0, vclk_max = 0;
+     uint32_t dclk_min = 0, dclk_max = 0;
+     uint32_t vclk1_min = 0, vclk1_max = 0;
+     uint32_t dclk1_min = 0, dclk1_max = 0;
      int ret = 0;
Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1345

Quoted 4 lines
      switch (level) {
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
@@ -1282,28 +1344,54 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1347

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
 NULL, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_FCLK,

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1351

Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 NULL, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,
 SMU_SOCCLK, NULL, &socclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1353

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 NULL, &vclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1355

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 NULL, &dclk_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK1,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1357

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 NULL, &vclk1_max);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK1,

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 NULL,
+&dclk1_max);
              sclk_min = sclk_max;
              fclk_min = fclk_max;
Quoted 8 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_set_performance_level(struct smu_context *smu,

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
              socclk_min = socclk_max;
+             vclk_min = vclk_max;
+             dclk_min = dclk_max;
+             vclk1_min = vclk1_max;
+             dclk1_min = dclk1_max;
              break;
      case AMD_DPM_FORCED_LEVEL_LOW:
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1371

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
 &sclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_FCLK,

Quoted 4 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1375

Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 &fclk_min, NULL);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,
 SMU_SOCCLK, &socclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1377

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 &vclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1379

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 &dclk_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK1,

Quoted 2 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1381

Quoted 2 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 &vclk1_min, NULL);
+             smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK1,

Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
 &dclk1_min,
+NULL);
              sclk_max = sclk_min;
              fclk_max = fclk_min;
Quoted 8 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_set_performance_level(struct smu_context *smu,

Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
              socclk_max = socclk_min;
+             vclk_max = vclk_min;
+             dclk_max = dclk_min;
+             vclk1_max = vclk1_min;
+             dclk1_max = dclk1_min;
              break;
      case AMD_DPM_FORCED_LEVEL_AUTO:
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SCLK,

Quoted 2 lines
Quoted 2 lines
&sclk_min, &sclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_FCLK,

Quoted 4 lines
Quoted 4 lines
&fclk_min, &fclk_max);
              smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_SOCCLK, &socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK,

Quoted 2 lines
Quoted 2 lines

&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK,

Quoted 2 lines
Quoted 2 lines

&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_VCLK1,

Quoted 2 lines
Quoted 2 lines

&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,

SMU_DCLK1,

Quoted 8 lines
Quoted 8 lines

&dclk1_min,

+&dclk1_max);
              break;
      case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK:
      case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:

- /* Temporarily do nothing since the optimal clocks haven't

been

Quoted 17 lines
Quoted 2 lines

provided yet */
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_SCLK,

Quoted 2 lines

&sclk_min, &sclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_FCLK,

Quoted 4 lines

&fclk_min, &fclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_SOCCLK, &socclk_min, &socclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_VCLK,

Quoted 2 lines

&vclk_min, &vclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_DCLK,

Quoted 2 lines

&dclk_min, &dclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,

SMU_VCLK1,

Quoted 8 lines
Quoted 4 lines

&vclk1_min, &vclk1_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_DCLK1,
+&dclk1_min, &dclk1_max);

We should not need to set the VCLK1 and DCLK1 for SMU v14.0.0.

Tim

Li: Sorry, the change in V1 is missing here.
There is a "else if" condition in smu_v14_0_common_get_dpm_ultimate_freq:
+ if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14,
+ 0, 1))

                smu_v14_0_1_get_dpm_ultimate_freq(smu, clk_type, min,

max);

(quoted diff) +3 -0
+       else if (clk_type != SMU_VCLK1 && clk_type != SMU_DCLK1)
+               smu_v14_0_0_get_dpm_ultimate_freq(smu, clk_type, min,
+ max);
 This will avoid to set VCLK1 and DCLK1 for SMU v14.0.0 and v14.0.4 Or using
Quoted 2 lines

smu version as condition is more reasonable?

Thanks for the clarification, I am ok to add the check here to avoid setting the VCLK1 and DCLK1 for SMU v14.0.0 and v14.0.4.

Tim

Quoted 79 lines

Thanks,
Li

Quoted 11 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1437

Quoted 11 lines
              break;
      case AMD_DPM_FORCED_LEVEL_MANUAL:
      case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
@@ -1343,6 +1431,42 @@ static int
 smu_v14_0_0_set_performance_level(struct smu_context *smu,
                      return ret;
      }
 
+     if (vclk_min && vclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+

SMU_VCLK,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1438

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

vclk_min,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1439

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

vclk_max);

Quoted 7 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_set_performance_level(struct smu_context *smu, · line 1451

Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +7 -0
+             if (ret)
+                     return ret;
+     }
+
+     if (vclk1_min && vclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+

SMU_VCLK1,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1447

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

vclk1_min,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1448

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

vclk1_max);

Quoted 7 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_set_performance_level(struct smu_context *smu, · line 1460

Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +7 -0
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk_min && dclk_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+

SMU_DCLK,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1456

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

dclk_min,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1457

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

dclk_max);

Quoted 7 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int smu_v14_0_0_set_performance_level(struct smu_context *smu, · line 1469

Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +7 -0
+             if (ret)
+                     return ret;
+     }
+
+     if (dclk1_min && dclk1_max) {
+             ret = smu_v14_0_0_set_soft_freq_limited_range(smu,
+

SMU_DCLK1,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1465

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

dclk1_min,

Quoted 1 line

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1466

Quoted 1 line
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -0
+

dclk1_max);

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4 -0
+             if (ret)
+                     return ret;
+     }
+
      return ret;
 }
Quoted 11 lines

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static const struct pptable_funcs · line 1648

Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
@@ -1520,7 +1644,7 @@ static const struct pptable_funcs
 smu_v14_0_0_ppt_funcs = {
      .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table,
      .print_clk_levels = smu_v14_0_0_print_clk_levels,
      .force_clk_levels = smu_v14_0_0_force_clk_levels,
-     .set_performance_level = smu_v14_0_0_set_performance_level,
+     .set_performance_level =

smu_v14_0_common_set_performance_level,

Quoted 3 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
      .set_fine_grain_gfx_freq_parameters =
 smu_v14_0_common_set_fine_grain_gfx_freq_parameters,
      .set_gfx_power_up_by_imu =

smu_v14_0_set_gfx_power_up_by_imu,

Quoted 4 lines
Quoted 3 lines
      .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,

--
2.25.1