<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Kevin Wang <kevin1.wang@amd.com></div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Best Regards,</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Kevin</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Le Ma <le.ma@amd.com><br>
<b>Sent:</b> Friday, August 9, 2019 7:27 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Ma, Le <Le.Ma@amd.com><br>
<b>Subject:</b> [PATCH 1/1] drm/amdgpu/powerplay: update Arcturus smu version in new place</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Follow patch below:<br>
drm/amd/powerplay: re-define smu interface version for smu v11<br>
<br>
Change-Id: Id78651209adc7a094f4c19ba965dcded37dd3ba7<br>
Signed-off-by: Le Ma <le.ma@amd.com><br>
---<br>
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 -<br>
drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h | 2 +-<br>
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 1 +<br>
drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 3 +++<br>
4 files changed, 5 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c<br>
index cff3777..e6fcbdf 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c<br>
@@ -1918,6 +1918,5 @@ void arcturus_set_ppt_funcs(struct smu_context *smu)<br>
struct smu_table_context *smu_table = &smu->smu_table;<br>
<br>
smu->ppt_funcs = &arcturus_ppt_funcs;<br>
- smu->smc_if_version = SMU11_DRIVER_IF_VERSION;<br>
smu_table->table_count = TABLE_COUNT;<br>
}<br>
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h<br>
index c7a7953..b99e98c 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h<br>
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h<br>
@@ -27,7 +27,7 @@<br>
// *** IMPORTANT ***<br>
// SMU TEAM: Always increment the interface version if<br>
// any structure is changed in this file<br>
-#define SMU11_DRIVER_IF_VERSION 0x08<br>
+//#define SMU11_DRIVER_IF_VERSION 0x08<br>
<br>
#define PPTABLE_ARCTURUS_SMU_VERSION 4<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h<br>
index ee8542d..acbb83d 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h<br>
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h<br>
@@ -27,6 +27,7 @@<br>
<br>
#define SMU11_DRIVER_IF_VERSION_INV 0xFFFFFFFF<br>
#define SMU11_DRIVER_IF_VERSION_VG20 0x13<br>
+#define SMU11_DRIVER_IF_VERSION_ARCT 0x08<br>
#define SMU11_DRIVER_IF_VERSION_NV10 0x33<br>
#define SMU11_DRIVER_IF_VERSION_NV14 0x34<br>
<br>
diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c<br>
index 91dfae1..3b8e58e 100644<br>
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c<br>
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c<br>
@@ -275,6 +275,9 @@ static int smu_v11_0_check_fw_version(struct smu_context *smu)<br>
case CHIP_VEGA20:<br>
smu->smc_if_version = SMU11_DRIVER_IF_VERSION_VG20;<br>
break;<br>
+ case CHIP_ARCTURUS:<br>
+ smu->smc_if_version = SMU11_DRIVER_IF_VERSION_ARCT;<br>
+ break;<br>
case CHIP_NAVI10:<br>
smu->smc_if_version = SMU11_DRIVER_IF_VERSION_NV10;<br>
break;<br>
-- <br>
2.7.4<br>
<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a></div>
</span></font></div>
</body>
</html>