Commit df770a01 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher

drm/amd/powerplay: update driver if file for sienna_cichlid

Update sienna_cichlid driver if header file to match pptable changes.
Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e05acd78
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
// *** IMPORTANT *** // *** IMPORTANT ***
// SMU TEAM: Always increment the interface version if // SMU TEAM: Always increment the interface version if
// any structure is changed in this file // any structure is changed in this file
#define SMU11_DRIVER_IF_VERSION 0x30 #define SMU11_DRIVER_IF_VERSION 0x31
#define PPTABLE_Sienna_Cichlid_SMU_VERSION 4 #define PPTABLE_Sienna_Cichlid_SMU_VERSION 4
...@@ -914,12 +914,14 @@ typedef struct { ...@@ -914,12 +914,14 @@ typedef struct {
uint16_t GfxActivityLpfTau; uint16_t GfxActivityLpfTau;
uint16_t UclkActivityLpfTau; uint16_t UclkActivityLpfTau;
uint16_t SocketPowerLpfTau; uint16_t SocketPowerLpfTau;
uint16_t VcnClkAverageLpfTau;
uint16_t padding16;
} DriverSmuConfig_t; } DriverSmuConfig_t;
typedef struct { typedef struct {
DriverSmuConfig_t DriverSmuConfig; DriverSmuConfig_t DriverSmuConfig;
uint32_t Spare[8]; uint32_t Spare[7];
// Padding - ignore // Padding - ignore
uint32_t MmHubPadding[8]; // SMU internal use uint32_t MmHubPadding[8]; // SMU internal use
} DriverSmuConfigExternal_t; } DriverSmuConfigExternal_t;
...@@ -984,11 +986,20 @@ typedef struct { ...@@ -984,11 +986,20 @@ typedef struct {
uint8_t D3HotEntryCountPerMode[D3HOT_SEQUENCE_COUNT]; uint8_t D3HotEntryCountPerMode[D3HOT_SEQUENCE_COUNT];
uint8_t D3HotExitCountPerMode[D3HOT_SEQUENCE_COUNT]; uint8_t D3HotExitCountPerMode[D3HOT_SEQUENCE_COUNT];
uint8_t ArmMsgReceivedCountPerMode[D3HOT_SEQUENCE_COUNT]; uint8_t ArmMsgReceivedCountPerMode[D3HOT_SEQUENCE_COUNT];
//PMFW-4362
uint32_t EnergyAccumulator;
uint16_t AverageVclk0Frequency ;
uint16_t AverageDclk0Frequency ;
uint16_t AverageVclk1Frequency ;
uint16_t AverageDclk1Frequency ;
uint16_t VcnActivityPercentage ; //place holder, David N. to provide full sequence
uint16_t padding16_2;
} SmuMetrics_t; } SmuMetrics_t;
typedef struct { typedef struct {
SmuMetrics_t SmuMetrics; SmuMetrics_t SmuMetrics;
uint32_t Spare[5]; uint32_t Spare[1];
// Padding - ignore // Padding - ignore
uint32_t MmHubPadding[8]; // SMU internal use uint32_t MmHubPadding[8]; // SMU internal use
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define SMU11_DRIVER_IF_VERSION_NV10 0x36 #define SMU11_DRIVER_IF_VERSION_NV10 0x36
#define SMU11_DRIVER_IF_VERSION_NV12 0x33 #define SMU11_DRIVER_IF_VERSION_NV12 0x33
#define SMU11_DRIVER_IF_VERSION_NV14 0x36 #define SMU11_DRIVER_IF_VERSION_NV14 0x36
#define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x30 #define SMU11_DRIVER_IF_VERSION_Sienna_Cichlid 0x31
/* MP Apertures */ /* MP Apertures */
#define MP0_Public 0x03800000 #define MP0_Public 0x03800000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment