<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:11pt;color:#0078D7;margin:5pt;" align="Left">
[AMD Official Use Only - Internal Distribution Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Series is:</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> Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com><br>
<b>Sent:</b> Wednesday, November 11, 2020 6:04 PM<br>
<b>To:</b> Deucher, Alexander <Alexander.Deucher@amd.com>; Clements, John <John.Clements@amd.com><br>
<b>Cc:</b> Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com><br>
<b>Subject:</b> [PATCH 2/2] drm/amdgpu: Enable TA firmware loading for dimgrey_cavefish</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com><br>
---<br>
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 10 +++-------<br>
1 file changed, 3 insertions(+), 7 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 03e88dbf92be..edd2d6bd1d86 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c<br>
@@ -62,7 +62,7 @@ MODULE_FIRMWARE("amdgpu/navy_flounder_ta.bin");<br>
MODULE_FIRMWARE("amdgpu/vangogh_asd.bin");<br>
MODULE_FIRMWARE("amdgpu/vangogh_toc.bin");<br>
MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_sos.bin");<br>
-MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_asd.bin");<br>
+MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_ta.bin");<br>
<br>
/* address block */<br>
#define smnMP1_FIRMWARE_FLAGS 0x3010024<br>
@@ -192,15 +192,11 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)<br>
break;<br>
case CHIP_SIENNA_CICHLID:<br>
case CHIP_NAVY_FLOUNDER:<br>
+ case CHIP_DIMGREY_CAVEFISH:<br>
err = psp_init_sos_microcode(psp, chip_name);<br>
if (err)<br>
return err;<br>
- err = psp_init_ta_microcode(&adev->psp, chip_name);<br>
- if (err)<br>
- return err;<br>
- break;<br>
- case CHIP_DIMGREY_CAVEFISH:<br>
- err = psp_init_sos_microcode(psp, chip_name);<br>
+ err = psp_init_ta_microcode(psp, chip_name);<br>
if (err)<br>
return err;<br>
break;<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>