Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amd/pm: update SMU 13.0.0 driver_if header

To fit the latest 78.53 PMFW.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Evan Quan and committed by
Alex Deucher
da1acbb1 00047c3d

+19 -14
+18 -13
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h
··· 24 24 #ifndef SMU13_DRIVER_IF_V13_0_0_H 25 25 #define SMU13_DRIVER_IF_V13_0_0_H 26 26 27 - // *** IMPORTANT *** 28 - // PMFW TEAM: Always increment the interface version on any change to this file 29 - #define SMU13_DRIVER_IF_VERSION 0x23 30 - 31 27 //Increment this version if SkuTable_t or BoardTable_t change 32 - #define PPTABLE_VERSION 0x1D 28 + #define PPTABLE_VERSION 0x22 33 29 34 30 #define NUM_GFXCLK_DPM_LEVELS 16 35 31 #define NUM_SOCCLK_DPM_LEVELS 8 ··· 1189 1193 // SECTION: Advanced Options 1190 1194 uint32_t DebugOverrides; 1191 1195 1196 + // Section: Total Board Power idle vs active coefficients 1197 + uint8_t TotalBoardPowerSupport; 1198 + uint8_t TotalBoardPowerPadding[3]; 1199 + 1200 + int16_t TotalIdleBoardPowerM; 1201 + int16_t TotalIdleBoardPowerB; 1202 + int16_t TotalBoardPowerM; 1203 + int16_t TotalBoardPowerB; 1204 + 1192 1205 // SECTION: Sku Reserved 1193 - uint32_t Spare[64]; 1206 + uint32_t Spare[61]; 1194 1207 1195 1208 // Padding for MMHUB - do not modify this 1196 1209 uint32_t MmHubPadding[8]; ··· 1264 1259 // SECTION: Clock Spread Spectrum 1265 1260 1266 1261 // UCLK Spread Spectrum 1267 - uint16_t UclkSpreadPadding; 1262 + uint8_t UclkTrainingModeSpreadPercent; 1263 + uint8_t UclkSpreadPadding; 1268 1264 uint16_t UclkSpreadFreq; // kHz 1269 1265 1270 1266 // UCLK Spread Spectrum ··· 1278 1272 1279 1273 // Section: Memory Config 1280 1274 uint8_t DramWidth; // Width of interface to the channel for each DRAM module. See DRAM_BIT_WIDTH_TYPE_e 1281 - uint8_t PaddingMem1[3]; 1282 - 1283 - // Section: Total Board Power 1284 - uint16_t TotalBoardPower; //Only needed for TCP Estimated case, where TCP = TGP+Total Board Power 1285 - uint16_t BoardPowerPadding; 1275 + uint8_t PaddingMem1[7]; 1286 1276 1287 1277 // SECTION: UMC feature flags 1288 1278 uint8_t HsrEnabled; ··· 1377 1375 uint16_t Vcn1ActivityPercentage ; 1378 1376 1379 1377 uint32_t EnergyAccumulator; 1380 - uint16_t AverageSocketPower ; 1378 + uint16_t AverageSocketPower; 1379 + uint16_t AverageTotalBoardPower; 1380 + 1381 1381 uint16_t AvgTemperature[TEMP_COUNT]; 1382 + uint16_t TempPadding; 1382 1383 1383 1384 uint8_t PcieRate ; 1384 1385 uint8_t PcieWidth ;
+1 -1
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
··· 30 30 #define SMU13_DRIVER_IF_VERSION_ALDE 0x08 31 31 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x05 32 32 #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 34 34 #define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x2C 35 35 36 36 #define SMU13_MODE1_RESET_WAIT_TIME_IN_MS 500 //500ms