<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">
<p style="font-family:Arial;font-size:10pt;color:#317100;margin:15pt;" align="Left">
[AMD Public Use]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Alex Deucher <alexander.deucher@amd.com><br>
</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> Quan, Evan <Evan.Quan@amd.com><br>
<b>Sent:</b> Sunday, September 20, 2020 10:47 PM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br>
<b>Cc:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; Quan, Evan <Evan.Quan@amd.com><br>
<b>Subject:</b> [PATCH] drm/amd/pm: correct the pmfw version check for Navi14</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Otherwise, that will be always true for Navi14.<br>
<br>
Change-Id: Ief94150d10e4987e405d97674d9ae4efe89246fb<br>
Signed-off-by: Evan Quan <evan.quan@amd.com><br>
---<br>
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 7 ++++---<br>
1 file changed, 4 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c<br>
index e729337e84d0..b9e522ed499a 100644<br>
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c<br>
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c<br>
@@ -2279,13 +2279,14 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)<br>
}<br>
<br>
/*<br>
- * The messages below are only supported by 42.53.0 and later<br>
- * PMFWs.<br>
+ * The messages below are only supported by Navi10 42.53.0 and later<br>
+ * PMFWs and Navi14 53.29.0 and later PMFWs.<br>
* - PPSMC_MSG_SetDriverDummyTableDramAddrHigh<br>
* - PPSMC_MSG_SetDriverDummyTableDramAddrLow<br>
* - PPSMC_MSG_GetUMCFWWA<br>
*/<br>
- if (pmfw_version >= 0x2a3500) {<br>
+ if (((adev->asic_type == CHIP_NAVI10) && (pmfw_version >= 0x2a3500)) ||<br>
+ ((adev->asic_type == CHIP_NAVI14) && (pmfw_version >= 0x351D00))) {<br>
ret = smu_cmn_send_smc_msg_with_param(smu,<br>
SMU_MSG_GET_UMC_FW_WA,<br>
0,<br>
-- <br>
2.28.0<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>