<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);">
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> S, Shirish <Shirish.S@amd.com><br>
<b>Sent:</b> Tuesday, August 3, 2021 4:42 AM<br>
<b>To:</b> Wentland, Harry <Harry.Wentland@amd.com>; Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com><br>
<b>Cc:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; S, Shirish <Shirish.S@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu/display: fix DMUB firmware version info</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">DMUB firmware info is printed before it gets initialized.<br>
Correct this order to ensure true value is conveyed.<br>
<br>
Signed-off-by: Shirish S <shirish.s@amd.com><br>
---<br>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
index 7e09b6d26a51..396a2dca2fe0 100644<br>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c<br>
@@ -1548,6 +1548,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)<br>
}<br>
<br>
hdr = (const struct dmcub_firmware_header_v1_0 *)adev->dm.dmub_fw->data;<br>
+ adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);<br>
<br>
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {<br>
adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].ucode_id =<br>
@@ -1561,7 +1562,6 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)<br>
adev->dm.dmcub_fw_version);<br>
}<br>
<br>
- adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);<br>
<br>
adev->dm.dmub_srv = kzalloc(sizeof(*adev->dm.dmub_srv), GFP_KERNEL);<br>
dmub_srv = adev->dm.dmub_srv;<br>
-- <br>
2.17.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>