<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:#0000FF;margin:5pt;" align="Left">
[AMD Official Use Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<span style="margin:0px;font-family:Calibri, sans-serif;background-color:white">Reviewed-by: Tao Zhou <</span><a href="mailto:tao.zhou1@amd.com" target="_blank" rel="noopener noreferrer" data-auth="NotApplicable" data-linkindex="0" style="margin:0px;font-family:Calibri, sans-serif;background-color:white">tao.zhou1@amd.com</a><span style="margin:0px;font-family:Calibri, sans-serif;background-color:white">></span><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> Huang, Ray <Ray.Huang@amd.com><br>
<b>Sent:</b> Wednesday, July 28, 2021 5:04 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>; Zhang, Hawking <Hawking.Zhang@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com>; Yu, Lang <Lang.Yu@amd.com>; Gong, Curry <Curry.Gong@amd.com>; Huang, Ray <Ray.Huang@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: enable psp front door loading by default for cyan_skillfish2</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">The function is ready on psp firmware, and enable it by default.<br>
<br>
Signed-off-by: Huang Rui <ray.huang@amd.com><br>
---<br>
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 ++++---<br>
 1 file changed, 4 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c<br>
index e001875ea1b7..5fdeceaa979f 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c<br>
@@ -410,10 +410,11 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)<br>
                 else<br>
                         return AMDGPU_FW_LOAD_PSP;<br>
         case CHIP_CYAN_SKILLFISH:<br>
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 &&<br>
-                   load_type > 1)<br>
+               if (!(load_type &&<br>
+                     adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2))<br>
+                       return AMDGPU_FW_LOAD_DIRECT;<br>
+               else<br>
                         return AMDGPU_FW_LOAD_PSP;<br>
-               return AMDGPU_FW_LOAD_DIRECT;<br>
         default:<br>
                 DRM_ERROR("Unknown firmware load type\n");<br>
         }<br>
-- <br>
2.25.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>