Skip to content

Commit da1acbb

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/pm: update SMU 13.0.0 driver_if header
To fit the latest 78.53 PMFW. Signed-off-by: Evan Quan <[email protected]> Reviewed-by: Feifei Xu <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 00047c3 commit da1acbb

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@
2424
#ifndef SMU13_DRIVER_IF_V13_0_0_H
2525
#define SMU13_DRIVER_IF_V13_0_0_H
2626

27-
// *** IMPORTANT ***
28-
// PMFW TEAM: Always increment the interface version on any change to this file
29-
#define SMU13_DRIVER_IF_VERSION 0x23
30-
3127
//Increment this version if SkuTable_t or BoardTable_t change
32-
#define PPTABLE_VERSION 0x1D
28+
#define PPTABLE_VERSION 0x22
3329

3430
#define NUM_GFXCLK_DPM_LEVELS 16
3531
#define NUM_SOCCLK_DPM_LEVELS 8
@@ -1193,8 +1189,17 @@ typedef struct {
11931189
// SECTION: Advanced Options
11941190
uint32_t DebugOverrides;
11951191

1192+
// Section: Total Board Power idle vs active coefficients
1193+
uint8_t TotalBoardPowerSupport;
1194+
uint8_t TotalBoardPowerPadding[3];
1195+
1196+
int16_t TotalIdleBoardPowerM;
1197+
int16_t TotalIdleBoardPowerB;
1198+
int16_t TotalBoardPowerM;
1199+
int16_t TotalBoardPowerB;
1200+
11961201
// SECTION: Sku Reserved
1197-
uint32_t Spare[64];
1202+
uint32_t Spare[61];
11981203

11991204
// Padding for MMHUB - do not modify this
12001205
uint32_t MmHubPadding[8];
@@ -1259,7 +1264,8 @@ typedef struct {
12591264
// SECTION: Clock Spread Spectrum
12601265

12611266
// UCLK Spread Spectrum
1262-
uint16_t UclkSpreadPadding;
1267+
uint8_t UclkTrainingModeSpreadPercent;
1268+
uint8_t UclkSpreadPadding;
12631269
uint16_t UclkSpreadFreq; // kHz
12641270

12651271
// UCLK Spread Spectrum
@@ -1272,11 +1278,7 @@ typedef struct {
12721278

12731279
// Section: Memory Config
12741280
uint8_t DramWidth; // Width of interface to the channel for each DRAM module. See DRAM_BIT_WIDTH_TYPE_e
1275-
uint8_t PaddingMem1[3];
1276-
1277-
// Section: Total Board Power
1278-
uint16_t TotalBoardPower; //Only needed for TCP Estimated case, where TCP = TGP+Total Board Power
1279-
uint16_t BoardPowerPadding;
1281+
uint8_t PaddingMem1[7];
12801282

12811283
// SECTION: UMC feature flags
12821284
uint8_t HsrEnabled;
@@ -1375,8 +1377,11 @@ typedef struct {
13751377
uint16_t Vcn1ActivityPercentage ;
13761378

13771379
uint32_t EnergyAccumulator;
1378-
uint16_t AverageSocketPower ;
1380+
uint16_t AverageSocketPower;
1381+
uint16_t AverageTotalBoardPower;
1382+
13791383
uint16_t AvgTemperature[TEMP_COUNT];
1384+
uint16_t TempPadding;
13801385

13811386
uint8_t PcieRate ;
13821387
uint8_t PcieWidth ;

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
@@ -30,7 +30,7 @@
3030
#define SMU13_DRIVER_IF_VERSION_ALDE 0x08
3131
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x05
3232
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04
33-
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0 0x2C
33+
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0 0x2E
3434
#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x2C
3535

3636
#define SMU13_MODE1_RESET_WAIT_TIME_IN_MS 500 //500ms

0 commit comments

Comments
 (0)