<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<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;background-color:#FFFFFF;font-family:Calibri,Arial,Helvetica,sans-serif;">
<p>Thanks. I sent out a v2 where it adds a check to the load call as well.</p>
<p><br>
</p>
<p>Tom</p>
<br>
<br>
<div style="color: rgb(0, 0, 0);">
<div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> Deucher, Alexander<br>
<b>Sent:</b> Friday, August 26, 2016 10:42<br>
<b>To:</b> 'Tom St Denis'; amd-gfx@lists.freedesktop.org<br>
<b>Cc:</b> StDenis, Tom<br>
<b>Subject:</b> RE: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText"><br>
<br>
> -----Original Message-----<br>
> From: amd-gfx [<a href="mailto:amd-gfx-bounces@lists.freedesktop.org">mailto:amd-gfx-bounces@lists.freedesktop.org</a>] On Behalf<br>
> Of Tom St Denis<br>
> Sent: Friday, August 26, 2016 10:35 AM<br>
> To: amd-gfx@lists.freedesktop.org<br>
> Cc: StDenis, Tom<br>
> Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check<br>
> <br>
> Remove an errant return in the middle of the check<br>
> function as well as check for success in the start<br>
> function.<br>
> <br>
> Signed-off-by: Tom St Denis <tom.stdenis@amd.com><br>
<br>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com><br>
<br>
> ---<br>
> drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 7 +++----<br>
> 1 file changed, 3 insertions(+), 4 deletions(-)<br>
> <br>
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c<br>
> b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c<br>
> index 87c023e518ab..654ffcf73769 100644<br>
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c<br>
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c<br>
> @@ -195,9 +195,6 @@ static int cz_check_fw_load_finish(struct pp_smumgr<br>
> *smumgr,<br>
> if (smumgr == NULL || smumgr->device == NULL)<br>
> return -EINVAL;<br>
> <br>
> - return cgs_read_register(smumgr->device,<br>
> - mmSMU_MP1_SRBM2P_ARG_0);<br>
> -<br>
> cgs_write_register(smumgr->device, mmMP0PUB_IND_INDEX,<br>
> index);<br>
> <br>
> for (i = 0; i < smumgr->usec_timeout; i++) {<br>
> @@ -276,7 +273,9 @@ static int cz_start_smu(struct pp_smumgr *smumgr)<br>
> fw_to_check &= ~(UCODE_ID_SDMA1_MASK |<br>
> UCODE_ID_CP_MEC_JT2_MASK);<br>
> <br>
> cz_request_smu_load_fw(smumgr);<br>
> - cz_check_fw_load_finish(smumgr, fw_to_check);<br>
> + ret = cz_check_fw_load_finish(smumgr, fw_to_check);<br>
> + if (ret)<br>
> + printk(KERN_ERR "[ powerplay] SMU firmware load<br>
> failed\n");<br>
> <br>
> ret = cz_load_mec_firmware(smumgr);<br>
> if (ret)<br>
> --<br>
> 2.9.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>
</div>
</body>
</html>