Skip to contentSkip to conversation

drm/amd/swsmu: enable Pstates profile levels for SMU v14.0.4

PATCH In review Li Ma 3 participants 3 messages Jul 10, 2024 – Jul 11, 2024

Subsystems (3)
lore
Share & tools
lore

Li Ma

author
#0 lore raw

PATCH 1/1 drm/amd/swsmu: enable Pstates profile levels for SMU v14.0.4

Enables following UMD stable Pstates profile levels of power_dpm_force_performance_level for SMU v14.0.4.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +15 -3
index 5d47d58944f6..8798ebfcea83 100644
@@ -69,6 +69,9 @@
 #define SMU_14_0_0_UMD_PSTATE_SOCCLK			678
 #define SMU_14_0_0_UMD_PSTATE_FCLK			1800
 
+#define SMU_14_0_4_UMD_PSTATE_GFXCLK			938
+#define SMU_14_0_4_UMD_PSTATE_SOCCLK			938
+
 #define FEATURE_MASK(feature) (1ULL << feature)
 #define SMC_DPM_FEATURE ( \
 	FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \
@@ -1296,19 +1299,28 @@ static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context *smu,
 	switch (clk_type) {
 	case SMU_GFXCLK:
 	case SMU_SCLK:
-		clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+		if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+			clk_limit = SMU_14_0_4_UMD_PSTATE_GFXCLK;
+		else
+			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 (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+			clk_limit = SMU_14_0_4_UMD_PSTATE_SOCCLK;
+		else
+			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 (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+			smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, NULL, &clk_limit);
+		else
+			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)
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Li Ma

Enables following UMD stable Pstates profile levels of power_dpm_force_performance_level for SMU v14.0.4.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

Quoted 53 lines
---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +15 -4
index 5d47d58944f6..8798ebfcea83 100644
@@ -69,6 +69,9 @@
 #define SMU_14_0_0_UMD_PSTATE_SOCCLK                   678
 #define SMU_14_0_0_UMD_PSTATE_FCLK                     1800
 
+#define SMU_14_0_4_UMD_PSTATE_GFXCLK                   938
+#define SMU_14_0_4_UMD_PSTATE_SOCCLK                   938
+
 #define FEATURE_MASK(feature) (1ULL << feature)
 #define SMC_DPM_FEATURE ( \
        FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \
@@ -1296,19 +1299,28 @@ static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context *smu,
        switch (clk_type) {
        case SMU_GFXCLK:
        case SMU_SCLK:
-               clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+               if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+                       clk_limit = SMU_14_0_4_UMD_PSTATE_GFXCLK;
+               else
+                       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 (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+                       clk_limit = SMU_14_0_4_UMD_PSTATE_SOCCLK;
+               else
+                       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 (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 4))
+                       smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, NULL, &clk_limit);
+               else
+                       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)
--

2.25.1

Reviewed-by
#2 lore raw

[Public]

This patch is,

Quoted 96 lines

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Wednesday, July 10, 2024 9:48 PM
To: Ma, Li <[email protected]>
Cc: [email protected]; Huang, Tim <[email protected]>; Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>
Subject: Re: [PATCH] drm/amd/swsmu: enable Pstates profile levels for SMU v14.0.4

Quoted 10 lines · Li Ma

Enables following UMD stable Pstates profile levels of power_dpm_force_performance_level for SMU v14.0.4.

- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard

Quoted 2 lines
---
 .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c   | 18

+++++++++++++++---

Quoted 8 lines
 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0 -0
index 5d47d58944f6..8798ebfcea83 100644

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c line 77

Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
@@ -69,6 +69,9 @@
 #define SMU_14_0_0_UMD_PSTATE_SOCCLK                   678
 #define SMU_14_0_0_UMD_PSTATE_FCLK                     1800
 
+#define SMU_14_0_4_UMD_PSTATE_GFXCLK                   938
+#define SMU_14_0_4_UMD_PSTATE_SOCCLK                   938
+
 #define FEATURE_MASK(feature) (1ULL << feature)  #define
 SMC_DPM_FEATURE ( \
        FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -1296,19

+1299,28 @@

Quoted 1 line

static int smu_v14_0_common_get_dpm_profile_freq(struct smu_context

*smu,

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

Quoted 5 lines
        switch (clk_type) {
        case SMU_GFXCLK:
        case SMU_SCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
-               clk_limit = SMU_14_0_0_UMD_PSTATE_GFXCLK;
+               if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==

IP_VERSION(14, 0, 4))

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

Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+                       clk_limit = SMU_14_0_4_UMD_PSTATE_GFXCLK;
+               else
+                       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);

Quoted 1 line
                else if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK)

Quoted 1 line

smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK, &clk_limit, NULL);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

Quoted 4 lines
                break;
        case SMU_SOCCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
-               clk_limit = SMU_14_0_0_UMD_PSTATE_SOCCLK;
+               if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==

IP_VERSION(14, 0, 4))

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

Quoted 5 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3 -0
+                       clk_limit = SMU_14_0_4_UMD_PSTATE_SOCCLK;
+               else
+                       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);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

Quoted 4 lines
                break;
        case SMU_FCLK:
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1 -1
-               clk_limit = SMU_14_0_0_UMD_PSTATE_FCLK;
+               if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==

IP_VERSION(14, 0, 4))

Quoted 1 line

+

smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, NULL, &clk_limit);

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

Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2 -0
+               else
+                       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);

Quoted 5 lines
                else if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK)
--
2.25.1