<div dir="ltr">On Fri, Mar 9, 2018 at 2:45 AM, Christian König <span dir="ltr"><<a href="mailto:ckoenig.leichtzumerken@gmail.com" target="_blank">ckoenig.leichtzumerken@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div bgcolor="#FFFFFF">
<div class="gmail-m_-4726930752337344039moz-cite-prefix">Hi Rex,<br>
<br>
I think still initializing the PSP even when you don't need it for
firmware upload sounds like a good idea to me.<br>
<br>
But take that with a grain of salt since I really on don't know
that part of the hardware so well.<span class="gmail-HOEnZb"><font color="#888888"><br></font></span></div></div></blockquote><div><br></div><div>Right. We need PSP for GPU resets among other things. I also don't really like the fact that we use the module parameter directly to determine whether to load the PSP module or not, we should be using adev->firmware.load_type, but that doesn't get set until later. We should probably just move that earlier in the common code rather than having it in the soc files. The problem with checking the module parameter is that that param is gobal so if you you have multiple GPUs, you may get messed up.<br><br></div><div>Alex<br></div><div><br> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div bgcolor="#FFFFFF"><div class="gmail-m_-4726930752337344039moz-cite-prefix"><span class="gmail-HOEnZb"><font color="#888888">
<br>
Christian.</font></span><div><div class="gmail-h5"><br>
<br>
Am 09.03.2018 um 06:10 schrieb Zhu, Rex:<br>
</div></div></div><div><div class="gmail-h5">
<blockquote type="cite">
<div id="gmail-m_-4726930752337344039divtagdefaultwrapper" style="font-size:12pt;color:rgb(0,0,0);font-family:Calibri,Helvetica,sans-serif" dir="ltr">
<p style="margin-top:0px;margin-bottom:0px">Hi Alex,</p>
<p style="margin-top:0px;margin-bottom:0px"><br>
</p>
<p style="margin-top:0px;margin-bottom:0px">How about keep the
firmware type checking in
<font size="2"><span style="font-size:11pt">set_ip_blocks</span></font>.</p>
<p style="margin-top:0px;margin-bottom:0px">and remove the same
check code in psp module.</p>
<p style="margin-top:0px;margin-bottom:0px">also no need to change
load type if psp load firmware failed in psp module.</p>
<p style="margin-top:0px;margin-bottom:0px"><br>
</p>
<p style="margin-top:0px;margin-bottom:0px">Please review the
attached patch.</p>
<p style="margin-top:0px;margin-bottom:0px"><br>
</p>
<p style="margin-top:0px;margin-bottom:0px">Best Regards</p>
<p style="margin-top:0px;margin-bottom:0px">Rex<br>
</p>
<div style="color:rgb(0,0,0)">
<hr style="display:inline-block;width:98%">
<div id="gmail-m_-4726930752337344039divRplyFwdMsg" dir="ltr"><font style="font-size:11pt" face="Calibri, sans-serif" color="#000000"><b>From:</b>
amd-gfx <a class="gmail-m_-4726930752337344039moz-txt-link-rfc2396E" href="mailto:amd-gfx-bounces@lists.freedesktop.org" target="_blank"><amd-gfx-bounces@lists.<wbr>freedesktop.org></a> on
behalf of Alex Deucher <a class="gmail-m_-4726930752337344039moz-txt-link-rfc2396E" href="mailto:alexdeucher@gmail.com" target="_blank"><alexdeucher@gmail.com></a><br>
<b>Sent:</b> Friday, March 9, 2018 4:54 AM<br>
<b>To:</b> <a class="gmail-m_-4726930752337344039moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<b>Cc:</b> Deucher, Alexander<br>
<b>Subject:</b> [PATCH 2/2] drm/amdgpu/soc15: always load
the psp IP module</font>
<div> </div>
</div>
<div class="gmail-m_-4726930752337344039BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="gmail-m_-4726930752337344039PlainText">We already handle the firmware
loading type checks in the<br>
psp module directly, no need for an additional check.<br>
<br>
Signed-off-by: Alex Deucher
<a class="gmail-m_-4726930752337344039moz-txt-link-rfc2396E" href="mailto:alexander.deucher@amd.com" target="_blank"><alexander.deucher@amd.com></a><br>
---<br>
drivers/gpu/drm/amd/amdgpu/<wbr>soc15.c | 3 +--<br>
1 file changed, 1 insertion(+), 2 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/<wbr>soc15.c
b/drivers/gpu/drm/amd/amdgpu/<wbr>soc15.c<br>
index 8dc8b72ed49b..ecf58a68cf66 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/<wbr>soc15.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/<wbr>soc15.c<br>
@@ -531,8 +531,7 @@ int soc15_set_ip_blocks(struct
amdgpu_device *adev)<br>
amdgpu_device_ip_block_add(<wbr>adev,
&vega10_common_ip_block);<br>
amdgpu_device_ip_block_add(<wbr>adev,
&gmc_v9_0_ip_block);<br>
amdgpu_device_ip_block_add(<wbr>adev,
&vega10_ih_ip_block);<br>
- if (amdgpu_fw_load_type == 2 ||
amdgpu_fw_load_type == -1)<br>
-
amdgpu_device_ip_block_add(<wbr>adev,
&psp_v3_1_ip_block);<br>
+ amdgpu_device_ip_block_add(<wbr>adev,
&psp_v3_1_ip_block);<br>
if (!amdgpu_sriov_vf(adev))<br>
amdgpu_device_ip_block_add(<wbr>adev,
&amdgpu_pp_ip_block);<br>
if (adev->enable_virtual_display
|| amdgpu_sriov_vf(adev))<br>
-- <br>
2.13.6<br>
<br>
______________________________<wbr>_________________<br>
amd-gfx mailing list<br>
<a class="gmail-m_-4726930752337344039moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<a id="gmail-m_-4726930752337344039LPlnk123469" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/amd-gfx</a>
<div style="margin-bottom:20px;overflow:auto;width:100%;text-indent:0px" id="gmail-m_-4726930752337344039LPBorder_GT_15205709349260.10638474698232214">
<table style="width:90%;background-color:rgb(255,255,255);overflow:auto;padding-top:20px;padding-bottom:20px;margin-top:20px;border-top:1px dotted rgb(200,200,200);border-bottom:1px dotted rgb(200,200,200)" id="gmail-m_-4726930752337344039LPContainer_15205709349240.2808290117558123" cellspacing="0">
<tbody>
<tr style="border-spacing:0px" valign="top">
<td colspan="2" style="vertical-align:top;padding:0px;display:table-cell" id="gmail-m_-4726930752337344039TextCell_15205709349240.5375816182761378">
<div id="gmail-m_-4726930752337344039LPTitle_15205709349250.744041292827629">
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" style="text-decoration:none" id="gmail-m_-4726930752337344039LPUrlAnchor_15205709349250.5260705269625694" target="_blank">amd-gfx Info Page
- freedesktop.org</a></div>
<div id="gmail-m_-4726930752337344039LPMetadata_15205709349250.4352603789039715">
<a href="http://lists.freedesktop.org" target="_blank">lists.freedesktop.org</a></div>
<div id="gmail-m_-4726930752337344039LPDescription_15205709349260.4456905619796764">
Subscribing to amd-gfx: Subscribe to
amd-gfx by filling out the following form.
Use of all <a href="http://freedesktop.org" target="_blank">freedesktop.org</a> lists is
subject to our Code of ...</div>
</td>
</tr>
</tbody>
</table>
</div>
<br>
</div>
</span></font></div>
</div>
</div>
<br>
<fieldset class="gmail-m_-4726930752337344039mimeAttachmentHeader"></fieldset>
<br>
<pre>______________________________<wbr>_________________
amd-gfx mailing list
<a class="gmail-m_-4726930752337344039moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a>
<a class="gmail-m_-4726930752337344039moz-txt-link-freetext" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/amd-gfx</a>
</pre>
</blockquote>
<br>
</div></div></div>
</blockquote></div><br></div></div>