<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 id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">Acked-by: Alex Deucher <alexander.deucher@amd.com><br>
</p>
</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 Evan Quan <evan.quan@amd.com><br>
<b>Sent:</b> Thursday, December 13, 2018 1:14:51 AM<br>
<b>To:</b> amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> Quan, Evan<br>
<b>Subject:</b> [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">The new PSP SOS firmware can support both A0 and A1.<br>
<br>
Change-Id: I9bf85eb77b183a4403667c77e291e32689aed0af<br>
---<br>
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 12 +-----------<br>
1 file changed, 1 insertion(+), 11 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c<br>
index 61cf2f6954e7..f3f5d4dd4631 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c<br>
@@ -34,14 +34,11 @@<br>
#include "nbio/nbio_7_4_offset.h"<br>
<br>
MODULE_FIRMWARE("amdgpu/vega20_sos.bin");<br>
-MODULE_FIRMWARE("amdgpu/vega20_sos_old.bin");<br>
MODULE_FIRMWARE("amdgpu/vega20_ta.bin");<br>
<br>
/* address block */<br>
#define smnMP1_FIRMWARE_FLAGS 0x3010024<br>
<br>
-#define VEGA20_BL_VERSION_VAR_NEW 0xA1<br>
-<br>
static int<br>
psp_v11_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type)<br>
{<br>
@@ -104,7 +101,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)<br>
int err = 0;<br>
const struct psp_firmware_header_v1_0 *sos_hdr;<br>
const struct ta_firmware_header_v1_0 *ta_hdr;<br>
- uint32_t bl_version;<br>
<br>
DRM_DEBUG("\n");<br>
<br>
@@ -116,13 +112,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)<br>
BUG();<br>
}<br>
<br>
- bl_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_100);<br>
- bl_version = (bl_version & 0xFF0000) >> 16;<br>
-<br>
- if (bl_version == VEGA20_BL_VERSION_VAR_NEW)<br>
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);<br>
- else<br>
- snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos_old.bin", chip_name);<br>
+ snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);<br>
err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev);<br>
if (err)<br>
goto out;<br>
-- <br>
2.19.2<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><br>
</div>
</span></font></div>
</body>
</html>