1 files changed, 63 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2609-drm-amd-powerplay-update-smu11_driver_if_navi10.h.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2609-drm-amd-powerplay-update-smu11_driver_if_navi10.h.patch
new file mode 100644
index 00000000..615cc4e4
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2609-drm-amd-powerplay-update-smu11_driver_if_navi10.h.patch
@@ -0,0 +1,63 @@
+From 47172e5f4f9e80bcceee29ddc83ce76eae9003e5 Mon Sep 17 00:00:00 2001
+From: tiancyin <tianci.yin@amd.com>
+Date: Thu, 27 Jun 2019 14:19:37 +0800
+Subject: [PATCH 2609/2940] 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 <alexander.deucher@amd.com>
+Signed-off-by: tiancyin <tianci.yin@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_navi10.h | 6 +++---
+ drivers/gpu/drm/amd/powerplay/navi10_ppt.c                 | 2 +-
+ 2 files changed, 4 insertions(+), 4 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 a8b31bc50054..adbbfebbb1e5 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 0x32
++#define SMU11_DRIVER_IF_VERSION 0x33
+ 
+ #define PPTABLE_NV10_SMU_VERSION 8
+ 
+@@ -813,8 +813,8 @@ typedef struct {
+   uint16_t     UclkAverageLpfTau;
+   uint16_t     GfxActivityLpfTau;
+   uint16_t     UclkActivityLpfTau;
++  uint16_t     SocketPowerLpfTau;
+ 
+-  uint16_t     Padding;  
+   // Padding - ignore
+   uint32_t     MmHubPadding[8]; // SMU internal use
+ } DriverSmuConfig_t;
+@@ -853,7 +853,7 @@ typedef struct {
+   uint8_t  CurrGfxVoltageOffset  ;
+   uint8_t  CurrMemVidOffset      ;
+   uint8_t  Padding8              ;
+-  uint16_t CurrSocketPower       ;
++  uint16_t AverageSocketPower    ;
+   uint16_t TemperatureEdge       ;
+   uint16_t TemperatureHotspot    ;
+   uint16_t TemperatureMem        ;
+diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+index 99566de80572..373aeba44f16 100644
+--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+@@ -863,7 +863,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value)
+ 	if (ret)
+ 		return ret;
+ 
+-	*value = metrics.CurrSocketPower << 8;
++	*value = metrics.AverageSocketPower << 8;
+ 
+ 	return 0;
+ }
+-- 
+2.17.1
+