Skip to content

Commit 39b27ff

Browse files
tiancyinalexdeucher
authored andcommitted
drm/amd/powerplay: update smu11_driver_if_navi10.h
update the smu11_driver_if_navi10.h since navi10 smu fw update to 42.28 Acked-by: Alex Deucher <[email protected]> Signed-off-by: tiancyin <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 440e80c commit 39b27ff

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// *** IMPORTANT ***
2727
// SMU TEAM: Always increment the interface version if
2828
// any structure is changed in this file
29-
#define SMU11_DRIVER_IF_VERSION 0x32
29+
#define SMU11_DRIVER_IF_VERSION 0x33
3030

3131
#define PPTABLE_NV10_SMU_VERSION 8
3232

@@ -813,8 +813,8 @@ typedef struct {
813813
uint16_t UclkAverageLpfTau;
814814
uint16_t GfxActivityLpfTau;
815815
uint16_t UclkActivityLpfTau;
816+
uint16_t SocketPowerLpfTau;
816817

817-
uint16_t Padding;
818818
// Padding - ignore
819819
uint32_t MmHubPadding[8]; // SMU internal use
820820
} DriverSmuConfig_t;
@@ -853,7 +853,7 @@ typedef struct {
853853
uint8_t CurrGfxVoltageOffset ;
854854
uint8_t CurrMemVidOffset ;
855855
uint8_t Padding8 ;
856-
uint16_t CurrSocketPower ;
856+
uint16_t AverageSocketPower ;
857857
uint16_t TemperatureEdge ;
858858
uint16_t TemperatureHotspot ;
859859
uint16_t TemperatureMem ;

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value)
863863
if (ret)
864864
return ret;
865865

866-
*value = metrics.CurrSocketPower << 8;
866+
*value = metrics.AverageSocketPower << 8;
867867

868868
return 0;
869869
}

0 commit comments

Comments
 (0)