<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:DengXian;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Aptos;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
@font-face
{font-family:"\@DengXian";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
font-size:12.0pt;
font-family:"Aptos",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#467886;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
font-size:11.0pt;
font-family:"Arial",sans-serif;
mso-ligatures:standardcontextual;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Arial",sans-serif;}
span.EmailStyle22
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;
mso-ligatures:none;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="#467886" vlink="#96607D" style="word-wrap:break-word">
<p style="font-family:Calibri;font-size:10pt;color:#0000FF;margin:5pt;font-style:normal;font-weight:normal;text-decoration:none;" align="Left">
[AMD Official Use Only - AMD Internal Distribution Only]<br>
</p>
<br>
<div>
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">Regards,<br>
Hawking<o:p></o:p></span></p>
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Min, Frank <Frank.Min@amd.com>
<br>
<b>Sent:</b> Wednesday, August 6, 2025 21:07<br>
<b>To:</b> amd-gfx@lists.freedesktop.org; Deucher, Alexander <Alexander.Deucher@amd.com>; Zhang, Hawking <Hawking.Zhang@amd.com><br>
<b>Subject:</b> [PATCH] drm/amdgpu: Add PSP fw version check for fw reserve GFX command<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p style="margin:5.0pt"><span style="font-size:10.0pt;font-family:"Calibri",sans-serif;color:blue">[AMD Official Use Only - AMD Internal Distribution Only]<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoPlainText"><span style="font-family:Consolas">From: Frank Min <<a href="mailto:Frank.Min@amd.com">Frank.Min@amd.com</a>><o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">Date: Tue, 5 Aug 2025 22:30:54 +0800<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">Subject: [PATCH] drm/amdgpu: Add PSP fw version check for fw reserve GFX<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">command<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">The fw reserved GFX command is only supported starting from PSP fw<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">version 0x3a0e14 and 0x3b0e0d. Older versions do not support this command.<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">Add a version guard to ensure the command is only used when the running<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">PSP fw meets the minimum version requirement.<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">This ensures backward compatibility and safe operation across fw<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">revisions.<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">Signed-off-by: Frank Min <<a href="mailto:Frank.Min@amd.com">Frank.Min@amd.com</a>><o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">---<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 19 ++++++++++++++++---<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">1 file changed, 16 insertions(+), 3 deletions(-)<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">index 14121efb9d95..1acc1ffce31d 100644<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">@@ -1043,15 +1043,28 @@ int psp_update_fw_reservation(struct psp_context *psp)<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">{<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> int ret;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> uint64_t reserv_addr, reserv_addr_ext;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">- uint32_t reserv_size, reserv_size_ext;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ uint32_t reserv_size, reserv_size_ext, mp0_ip_ver;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> struct amdgpu_device *adev = psp->adev;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ mp0_ip_ver = amdgpu_ip_version(adev, MP0_HWIP, 0);<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> if (amdgpu_sriov_vf(psp->adev))<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> return 0;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">- if ((amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 2)) &&<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">- (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 3)))<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ switch (mp0_ip_ver) {<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ case IP_VERSION(14, 0, 2):<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ if (adev->psp.sos.fw_version < 0x3b0e0d)<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ return 0;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ break;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ case IP_VERSION(14, 0, 3):<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ if (adev->psp.sos.fw_version < 0x3a0e14)<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ return 0;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ break;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ default:<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> return 0;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">+ }<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> ret = psp_get_fw_reservation_info(psp, GFX_CMD_ID_FB_FW_RESERV_ADDR, &reserv_addr, &reserv_size);<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas"> if (ret)<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">--<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:Consolas">2.43.0<o:p></o:p></span></p>
</div>
</div>
</div>
</body>
</html>