summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Xiao <Jack.Xiao@amd.com>2019-05-28 15:43:02 +0800
committerAlex Deucher <alexander.deucher@amd.com>2019-06-21 18:59:33 -0500
commit4bc920a68028f476d0460a31bad488b602af8eab (patch)
treea091969c14a9f72fac4c6356e566d96e27b5fb8e
parent86ddf3529e34d768a70f074bfbac5c9af0434f78 (diff)
downloadlinux-stable-4bc920a68028f476d0460a31bad488b602af8eab.tar.gz
linux-stable-4bc920a68028f476d0460a31bad488b602af8eab.tar.bz2
linux-stable-4bc920a68028f476d0460a31bad488b602af8eab.zip
drm/amd/powerplay: update smu11_driver_if_navi10.h
update the smu11_driver_if_navi10.h since navi10 smu fw update to 42.23 Signed-off-by: Jack Xiao <Jack.Xiao@amd.com> Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h
index b3993d382ad5..a8b31bc50054 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h
@@ -26,7 +26,7 @@
// *** IMPORTANT ***
// SMU TEAM: Always increment the interface version if
// any structure is changed in this file
-#define SMU11_DRIVER_IF_VERSION 0x2F
+#define SMU11_DRIVER_IF_VERSION 0x32
#define PPTABLE_NV10_SMU_VERSION 8
@@ -114,7 +114,7 @@
#define FEATURE_MMHUB_PG_BIT 40
#define FEATURE_ATHUB_PG_BIT 41
-#define FEATURE_SPARE_42_BIT 42
+#define FEATURE_APCC_DFLL_BIT 42
#define FEATURE_SPARE_43_BIT 43
#define FEATURE_SPARE_44_BIT 44
#define FEATURE_SPARE_45_BIT 45
@@ -490,23 +490,26 @@ typedef struct {
uint16_t FanTargetTemperature;
uint16_t MemoryTemperatureLimit;
- uint16_t Reserved2;
+ uint16_t MemoryTemperatureLimit1;
uint16_t TGP;
- uint16_t Reserved3;
+ uint16_t CardPower;
uint32_t DieTemperatureRegisterOffset;
- uint32_t Reserved4;
+ uint32_t Reserved2;
- uint32_t Reserved5;
+ uint32_t Reserved3;
uint32_t Status;
uint16_t DieTemperature;
uint16_t MemoryTemperature;
- uint32_t MmHubPadding[8]; // SMU internal use
+ uint16_t SelectedCardPower;
+ uint16_t Reserved4;
+
+ uint32_t BoardLevelEnergyAccumulator;
} OutOfBandMonitor_t;
typedef struct {
@@ -794,8 +797,8 @@ typedef struct {
uint16_t BoardPadding;
// Mvdd Svi2 Div Ratio Setting
- uint32_t MvddRatio; // This is used for MVDD Vid workaround. It has 16 fractional bits (Q16.16)
-
+ uint32_t MvddRatio; // This is used for MVDD Vid workaround. It has 16 fractional bits (Q16.16)
+
uint32_t BoardReserved[9];
// Padding for MMHUB - do not modify this
@@ -865,7 +868,8 @@ typedef struct {
uint32_t ThrottlerStatus ;
uint8_t LinkDpmLevel;
- uint8_t Padding[3];
+ uint8_t Padding8_2;
+ uint16_t CurrFanSpeed;
// Padding - ignore
uint32_t MmHubPadding[8]; // SMU internal use