Skip to content

Commit dc38b99

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/pm: bump SMU 13.0.7 driver_if header version
This can suppress the warning caused by version mismatch. Signed-off-by: Evan Quan <[email protected]> Acked-by: Alex Deucher <[email protected]> Acked-by: Guchun Chen <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] # 6.1.x
1 parent 9874cc2 commit dc38b99

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,21 @@
113113
#define NUM_FEATURES 64
114114

115115
#define ALLOWED_FEATURE_CTRL_DEFAULT 0xFFFFFFFFFFFFFFFFULL
116-
#define ALLOWED_FEATURE_CTRL_SCPM (1 << FEATURE_DPM_GFXCLK_BIT) | \
117-
(1 << FEATURE_DPM_GFX_POWER_OPTIMIZER_BIT) | \
118-
(1 << FEATURE_DPM_UCLK_BIT) | \
119-
(1 << FEATURE_DPM_FCLK_BIT) | \
120-
(1 << FEATURE_DPM_SOCCLK_BIT) | \
121-
(1 << FEATURE_DPM_MP0CLK_BIT) | \
122-
(1 << FEATURE_DPM_LINK_BIT) | \
123-
(1 << FEATURE_DPM_DCN_BIT) | \
124-
(1 << FEATURE_DS_GFXCLK_BIT) | \
125-
(1 << FEATURE_DS_SOCCLK_BIT) | \
126-
(1 << FEATURE_DS_FCLK_BIT) | \
127-
(1 << FEATURE_DS_LCLK_BIT) | \
128-
(1 << FEATURE_DS_DCFCLK_BIT) | \
129-
(1 << FEATURE_DS_UCLK_BIT)
116+
#define ALLOWED_FEATURE_CTRL_SCPM ((1 << FEATURE_DPM_GFXCLK_BIT) | \
117+
(1 << FEATURE_DPM_GFX_POWER_OPTIMIZER_BIT) | \
118+
(1 << FEATURE_DPM_UCLK_BIT) | \
119+
(1 << FEATURE_DPM_FCLK_BIT) | \
120+
(1 << FEATURE_DPM_SOCCLK_BIT) | \
121+
(1 << FEATURE_DPM_MP0CLK_BIT) | \
122+
(1 << FEATURE_DPM_LINK_BIT) | \
123+
(1 << FEATURE_DPM_DCN_BIT) | \
124+
(1 << FEATURE_DS_GFXCLK_BIT) | \
125+
(1 << FEATURE_DS_SOCCLK_BIT) | \
126+
(1 << FEATURE_DS_FCLK_BIT) | \
127+
(1 << FEATURE_DS_LCLK_BIT) | \
128+
(1 << FEATURE_DS_DCFCLK_BIT) | \
129+
(1 << FEATURE_DS_UCLK_BIT) | \
130+
(1ULL << FEATURE_DS_VCN_BIT))
130131

131132
//For use with feature control messages
132133
typedef enum {

drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x07
3333
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04
3434
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0_10 0x32
35-
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x35
35+
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x37
3636
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_10 0x1D
3737

3838
#define SMU13_MODE1_RESET_WAIT_TIME_IN_MS 500 //500ms

0 commit comments

Comments
 (0)