<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Exchange Server">  <style></style> </head> <body> <font face="Times New Roman" size="3"><span style="font-size:12pt;"><a name="_msipheadera4477989"></a> <div><font face="Arial" size="2" color="blue"><span style="font-size:10pt;">[AMD Official Use Only]<br> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">Thanks for the quick turnaround. Please check my comments inline.</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">In addition, it might be better to shorten the commit tile to “adjust ip block add sequence on aldebaran”, and add detailed information in commit message</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">Something like “to fix disable smu feature failure on aldebaran”</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">Regards,<br> Hawking</span></font></div> <div><font size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">-----Original Message-----<br> From: Stanley.Yang <Stanley.Yang@amd.com> <br> Sent: Monday, November 29, 2021 13:56<br> To: amd-gfx@lists.freedesktop.org; Zhang, Hawking <Hawking.Zhang@amd.com>; Clements, John <John.Clements@amd.com>; Zhou1, Tao <Tao.Zhou1@amd.com><br> Cc: Yang, Stanley <Stanley.Yang@amd.com><br> Subject: [PATCH Review 1/1] drm/amdgpu: adjust ip block suspend sequence on aldebaran to fix disable smu feature failure</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">{</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> [ 578.019986] amdgpu 0000:23:00.0: amdgpu: GPU reset begin!</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> [ 583.245566] amdgpu 0000:23:00.0: amdgpu: Failed to disable smu features.</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> [ 583.245621] amdgpu 0000:23:00.0: amdgpu: Fail to disable dpm features!</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> [ 583.245639] [drm:amdgpu_device_ip_suspend_phase2 [amdgpu]] *ERROR* suspend of IP block <smu> failed -62</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> [ 583.248504] [drm] free PSP TMR buffer }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">Signed-off-by: Stanley.Yang <<a href="mailto:Stanley.Yang@amd.com">Stanley.Yang@amd.com</a>></span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">---</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +++++++++++++++----</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> 1 file changed, 15 insertions(+), 4 deletions(-)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">index 4e3669407518..364808f3607f 100644</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">@@ -1309,10 +1309,13 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">- if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">- r = amdgpu_discovery_set_smu_ip_blocks(adev);</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">- if (r)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">- return r;</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ /* move add smu block after add smda block for aldebaran */</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (adev->ip_versions[MP1_HWIP][0] != IP_VERSION(13, 0 ,2)) {</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {</span></font></div> <div><font face="Calibri" size="2" color="#4472C4"><span style="font-size:11pt;">[Hawking]: can we merge the condition with "&&"?</span></font></div> <div><font size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ r = amdgpu_discovery_set_smu_ip_blocks(adev);</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (r)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ return r;</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> r = amdgpu_discovery_set_display_ip_blocks(adev);</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">@@ -1327,6 +1330,14 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> if (r)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> return r;</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0 ,2)) {</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ r = amdgpu_discovery_set_smu_ip_blocks(adev);</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ if (r)</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ return r;</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+ }</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">+</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> !amdgpu_sriov_vf(adev)) {</span></font></div> <div><font face="Calibri" size="2" color="#4472C4"><span style="font-size:11pt;">[Hawking]: can we merge the condition check with “||”</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> r = amdgpu_discovery_set_smu_ip_blocks(adev);</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">--</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;">2.17.1</span></font></div> <div><font face="Calibri" size="2"><span style="font-size:11pt;"> </span></font></div> <div><font size="2"><span style="font-size:11pt;"> </span></font></div> </span></font> </body> </html>