diff options
| author | Likun Gao <Likun.Gao@amd.com> | 2020-06-03 12:33:18 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-01 01:59:17 -0400 |
| commit | df770a01471f1bc0cc2542700229f13249369f0a (patch) | |
| tree | b89fb33803c7ce49250dcf7ecec0ee83f02bf49d /drivers/gpu/drm | |
| parent | e05acd78b8855f5bcf8067486f9787c1ae141e8d (diff) | |
drm/amd/powerplay: update driver if file for sienna_cichlid
Update sienna_cichlid driver if header file to match pptable changes.
Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h | 17 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h index bdffba1f0086..5322f6da3071 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_sienna_cichlid.h @@ -27,7 +27,7 @@ // *** IMPORTANT *** // SMU TEAM: Always increment the interface version if // 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 @@ -914,12 +914,14 @@ typedef struct { uint16_t GfxActivityLpfTau; uint16_t UclkActivityLpfTau; uint16_t SocketPowerLpfTau; + uint16_t VcnClkAverageLpfTau; + uint16_t padding16; } DriverSmuConfig_t; typedef struct { DriverSmuConfig_t DriverSmuConfig; - uint32_t Spare[8]; + uint32_t Spare[7]; // Padding - ignore uint32_t MmHubPadding[8]; // SMU internal use } DriverSmuConfigExternal_t; @@ -984,11 +986,20 @@ typedef struct { uint8_t D3HotEntryCountPerMode[D3HOT_SEQUENCE_COUNT]; uint8_t D3HotExitCountPerMode[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; typedef struct { SmuMetrics_t SmuMetrics; - uint32_t Spare[5]; + uint32_t Spare[1]; // Padding - ignore uint32_t MmHubPadding[8]; // SMU internal use diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h index 1100310f5b89..9da2f26b7267 100644 --- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h @@ -30,7 +30,7 @@ #define SMU11_DRIVER_IF_VERSION_NV10 0x36 #define SMU11_DRIVER_IF_VERSION_NV12 0x33 #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 */ #define MP0_Public 0x03800000 |