Skip to contentSkip to conversation

drm/amd/pm: add smu feature map support for smu_v13_0_7

PATCH In review Yang Wang 2 participants 3 messages May 11, 2022

Subsystems (3)
lore
Share & tools
lore

Yang Wang

author
#0 lore raw

PATCH 1/2 drm/amd/pm: add smu feature map support for smu_v13_0_7

the pp_features can't display full feauture information when these mapping is not exiting.

---
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h  | 23 ++++++++
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 58 ++++++++++++++++---
 2 files changed, 73 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +23 -0
index 3f40cd6e4165..799050ea7515 100644
@@ -368,6 +368,29 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(DATA_CALCULATION),				\
        __SMU_DUMMY_MAP(DPM_VCLK),			\
        __SMU_DUMMY_MAP(DPM_DCLK),			\
+       __SMU_DUMMY_MAP(FW_DATA_READ),			\
+       __SMU_DUMMY_MAP(DPM_GFX_POWER_OPTIMIZER),	\
+       __SMU_DUMMY_MAP(DPM_DCN),			\
+       __SMU_DUMMY_MAP(VMEMP_SCALING),			\
+       __SMU_DUMMY_MAP(VDDIO_MEM_SCALING),		\
+       __SMU_DUMMY_MAP(MM_DPM),				\
+       __SMU_DUMMY_MAP(SOC_MPCLK_DS),			\
+       __SMU_DUMMY_MAP(BACO_MPCLK_DS),			\
+       __SMU_DUMMY_MAP(THROTTLERS),			\
+       __SMU_DUMMY_MAP(SMARTSHIFT),			\
+       __SMU_DUMMY_MAP(GFX_READ_MARGIN),		\
+       __SMU_DUMMY_MAP(GFX_IMU),			\
+       __SMU_DUMMY_MAP(GFX_PCC_DFLL),			\
+       __SMU_DUMMY_MAP(BOOT_TIME_CAL),			\
+       __SMU_DUMMY_MAP(BOOT_POWER_OPT),			\
+       __SMU_DUMMY_MAP(GFXCLK_SPREAD_SPECTRUM),		\
+       __SMU_DUMMY_MAP(SOC_PCC),			\
+       __SMU_DUMMY_MAP(OPTIMIZED_VMIN),			\
+       __SMU_DUMMY_MAP(CLOCK_POWER_DOWN_BYPASS),	\
+       __SMU_DUMMY_MAP(MEM_TEMP_READ),			\
+       __SMU_DUMMY_MAP(ATHUB_MMHUB_PG),			\
+       __SMU_DUMMY_MAP(BACO_CG),			\
+       __SMU_DUMMY_MAP(SOC_CG),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)	SMU_FEATURE_##feature##_BIT
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +50 -8

64 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 drm/amd/pm: add smu feature map support for smu_v13_0_0

the pp_features can't display full feauture information when these mapping is not exiting.

---
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  | 69 ++++++++++++++-----
 1 file changed, 50 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +50 -19
index 86f98e968341..197a0e2ff063 100644
@@ -133,25 +133,56 @@ static struct cmn2asic_mapping smu_v13_0_0_clk_map[SMU_CLK_COUNT] = {
 };
 
 static struct cmn2asic_mapping smu_v13_0_0_feature_mask_map[SMU_FEATURE_COUNT] = {
-	[SMU_FEATURE_DPM_GFXCLK_BIT] = {1, FEATURE_DPM_GFXCLK_BIT},
-	[SMU_FEATURE_DPM_UCLK_BIT] = {1, FEATURE_DPM_UCLK_BIT},
-	[SMU_FEATURE_DPM_FCLK_BIT] = {1, FEATURE_DPM_FCLK_BIT},
-	[SMU_FEATURE_DPM_SOCCLK_BIT] = {1, FEATURE_DPM_SOCCLK_BIT},
-	[SMU_FEATURE_DPM_LINK_BIT] = {1, FEATURE_DPM_LINK_BIT},
-	[SMU_FEATURE_DPM_VCLK_BIT] = {1, FEATURE_MM_DPM_BIT},
-	[SMU_FEATURE_DPM_DCLK_BIT] = {1, FEATURE_MM_DPM_BIT},
-	[SMU_FEATURE_FAN_CONTROL_BIT] = {1, FEATURE_FAN_CONTROL_BIT},
-	[SMU_FEATURE_PPT_BIT] = {1, FEATURE_THROTTLERS_BIT},
-	[SMU_FEATURE_DS_GFXCLK_BIT] = {1, FEATURE_DS_GFXCLK_BIT},
-	[SMU_FEATURE_DS_SOCCLK_BIT] = {1, FEATURE_DS_SOCCLK_BIT},
-	[SMU_FEATURE_DS_UCLK_BIT] = {1, FEATURE_DS_UCLK_BIT},
-	[SMU_FEATURE_DS_FCLK_BIT] = {1, FEATURE_DS_FCLK_BIT},
-	[SMU_FEATURE_DS_LCLK_BIT] = {1, FEATURE_DS_LCLK_BIT},
-	[SMU_FEATURE_DS_VCN_BIT] = {1, FEATURE_DS_VCN_BIT},
-	[SMU_FEATURE_DS_MP0CLK_BIT] = {1, FEATURE_SOC_MPCLK_DS_BIT},
-	[SMU_FEATURE_DS_MP1CLK_BIT] = {1, FEATURE_BACO_MPCLK_DS_BIT},
-	[SMU_FEATURE_GFX_ULV_BIT] = {1, FEATURE_GFX_ULV_BIT},
-	[SMU_FEATURE_BACO_BIT] = {1, FEATURE_BACO_BIT},
+	FEA_MAP(FW_DATA_READ),
+	FEA_MAP(DPM_GFXCLK),
+	FEA_MAP(DPM_GFX_POWER_OPTIMIZER),
+	FEA_MAP(DPM_UCLK),
+	FEA_MAP(DPM_FCLK),
+	FEA_MAP(DPM_SOCCLK),
+	FEA_MAP(DPM_MP0CLK),
+	FEA_MAP(DPM_LINK),
+	FEA_MAP(DPM_DCN),
+	FEA_MAP(VMEMP_SCALING),
+	FEA_MAP(VDDIO_MEM_SCALING),
+	FEA_MAP(DS_GFXCLK),
+	FEA_MAP(DS_SOCCLK),
+	FEA_MAP(DS_FCLK),
+	FEA_MAP(DS_LCLK),
+	FEA_MAP(DS_DCFCLK),
+	FEA_MAP(DS_UCLK),
+	FEA_MAP(GFX_ULV),
+	FEA_MAP(FW_DSTATE),
+	FEA_MAP(GFXOFF),
+	FEA_MAP(BACO),
+	FEA_MAP(MM_DPM),
+	FEA_MAP(SOC_MPCLK_DS),
+	FEA_MAP(BACO_MPCLK_DS),
+	FEA_MAP(THROTTLERS),
+	FEA_MAP(SMARTSHIFT),
+	FEA_MAP(GTHR),
+	FEA_MAP(ACDC),
+	FEA_MAP(VR0HOT),
+	FEA_MAP(FW_CTF),
+	FEA_MAP(FAN_CONTROL),
+	FEA_MAP(GFX_DCS),
+	FEA_MAP(GFX_READ_MARGIN),
+	FEA_MAP(LED_DISPLAY),
+	FEA_MAP(GFXCLK_SPREAD_SPECTRUM),
+	FEA_MAP(OUT_OF_BAND_MONITOR),
+	FEA_MAP(OPTIMIZED_VMIN),
+	FEA_MAP(GFX_IMU),
+	FEA_MAP(BOOT_TIME_CAL),
+	FEA_MAP(GFX_PCC_DFLL),
+	FEA_MAP(SOC_CG),
+	FEA_MAP(DF_CSTATE),
+	FEA_MAP(GFX_EDC),
+	FEA_MAP(BOOT_POWER_OPT),
+	FEA_MAP(CLOCK_POWER_DOWN_BYPASS),
+	FEA_MAP(DS_VCN),
+	FEA_MAP(BACO_CG),
+	FEA_MAP(MEM_TEMP_READ),
+	FEA_MAP(ATHUB_MMHUB_PG),
+	FEA_MAP(SOC_PCC),
 };
 
 static struct cmn2asic_mapping smu_v13_0_0_table_map[SMU_TABLE_COUNT] = {
Signature · 1 line
2.25.1
maintainer
#2 lore raw
In reply to Yang Wang

[AMD Official Use Only - General]

Series is Reviewed-by: Kenneth Feng <[email protected]<mailto:[email protected]>>

Best wishes
Kenneth Feng

发件人: amd-gfx <[email protected]> 代表 Yang Wang <[email protected]> 日期: 星期三, 2022年5月11日 13:09
收件人: [email protected] <[email protected]>
抄送: Wang, Yang(Kevin) <[email protected]>
主题: [PATCH 1/2] drm/amd/pm: add smu feature map support for smu_v13_0_7 [CAUTION: External Email]

the pp_features can't display full feauture information when these mapping is not exiting.

---
 drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h  | 23 ++++++++
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 58 ++++++++++++++++---
 2 files changed, 73 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +23 -0
index 3f40cd6e4165..799050ea7515 100644
@@ -368,6 +368,29 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(DATA_CALCULATION),                              \
        __SMU_DUMMY_MAP(DPM_VCLK),                      \
        __SMU_DUMMY_MAP(DPM_DCLK),                      \
+       __SMU_DUMMY_MAP(FW_DATA_READ),                  \
+       __SMU_DUMMY_MAP(DPM_GFX_POWER_OPTIMIZER),       \
+       __SMU_DUMMY_MAP(DPM_DCN),                       \
+       __SMU_DUMMY_MAP(VMEMP_SCALING),                 \
+       __SMU_DUMMY_MAP(VDDIO_MEM_SCALING),             \
+       __SMU_DUMMY_MAP(MM_DPM),                                \
+       __SMU_DUMMY_MAP(SOC_MPCLK_DS),                  \
+       __SMU_DUMMY_MAP(BACO_MPCLK_DS),                 \
+       __SMU_DUMMY_MAP(THROTTLERS),                    \
+       __SMU_DUMMY_MAP(SMARTSHIFT),                    \
+       __SMU_DUMMY_MAP(GFX_READ_MARGIN),               \
+       __SMU_DUMMY_MAP(GFX_IMU),                       \
+       __SMU_DUMMY_MAP(GFX_PCC_DFLL),                  \
+       __SMU_DUMMY_MAP(BOOT_TIME_CAL),                 \
+       __SMU_DUMMY_MAP(BOOT_POWER_OPT),                        \
+       __SMU_DUMMY_MAP(GFXCLK_SPREAD_SPECTRUM),                \
+       __SMU_DUMMY_MAP(SOC_PCC),                       \
+       __SMU_DUMMY_MAP(OPTIMIZED_VMIN),                        \
+       __SMU_DUMMY_MAP(CLOCK_POWER_DOWN_BYPASS),       \
+       __SMU_DUMMY_MAP(MEM_TEMP_READ),                 \
+       __SMU_DUMMY_MAP(ATHUB_MMHUB_PG),                        \
+       __SMU_DUMMY_MAP(BACO_CG),                       \
+       __SMU_DUMMY_MAP(SOC_CG),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)       SMU_FEATURE_##feature##_BIT
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +50 -8

64 lines not on this page · raw message

--
2.25.1