<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<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 dir="ltr" style="font-family: Aptos, Aptos_MSFontService, -apple-system, Roboto, Arial, Helvetica, sans-serif; font-size: 12pt;">
Looks good to me.</div>
<div dir="ltr" style="font-family: Aptos, Aptos_MSFontService, -apple-system, Roboto, Arial, Helvetica, sans-serif; font-size: 12pt;">
reviewed by shaoyun.liu <shaoyun.liu@amd.com></div>
<div dir="ltr" style="font-family: Aptos, Aptos_MSFontService, -apple-system, Roboto, Arial, Helvetica, sans-serif; font-size: 12pt;">
<br>
</div>
<div id="ms-outlook-mobile-body-separator-line" dir="ltr"><br>
</div>
<div id="ms-outlook-mobile-signature">获取 <a href="https://aka.ms/o0ukef">Outlook for iOS</a></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>发件人:</b> Alex Deucher <alexdeucher@gmail.com><br>
<b>发送时间:</b> Wednesday, June 18, 2025 10:18:06 AM<br>
<b>收件人:</b> Deucher, Alexander <Alexander.Deucher@amd.com><br>
<b>抄送:</b> amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Liu, Shaoyun <Shaoyun.Liu@amd.com><br>
<b>主题:</b> Re: [PATCH] drm/amdgpu/mes: add compatibility checks for set_hw_resource_1</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Ping?<br>
<br>
On Tue, Jun 17, 2025 at 12:47 PM Alex Deucher <alexander.deucher@amd.com> wrote:<br>
><br>
> Seems some older MES firmware versions do not properly support<br>
> this packet. Add back some the compatibility checks.<br>
><br>
> v2: switch to fw version check (Shaoyun)<br>
><br>
> Fixes: f81cd793119e ("drm/amd/amdgpu: Fix MES init sequence")<br>
> Closes: <a href="https://gitlab.freedesktop.org/drm/amd/-/issues/4295">https://gitlab.freedesktop.org/drm/amd/-/issues/4295</a><br>
> Cc: Shaoyun Liu <shaoyun.liu@amd.com><br>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br>
> ---<br>
> drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 10 ++++++----<br>
> drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 3 ++-<br>
> 2 files changed, 8 insertions(+), 5 deletions(-)<br>
><br>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c<br>
> index c9eba537de094..28eb846280dd4 100644<br>
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c<br>
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c<br>
> @@ -1630,10 +1630,12 @@ static int mes_v11_0_hw_init(struct amdgpu_ip_block *ip_block)<br>
> if (r)<br>
> goto failure;<br>
><br>
> - r = mes_v11_0_set_hw_resources_1(&adev->mes);<br>
> - if (r) {<br>
> - DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);<br>
> - goto failure;<br>
> + if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x50) {<br>
> + r = mes_v11_0_set_hw_resources_1(&adev->mes);<br>
> + if (r) {<br>
> + DRM_ERROR("failed mes_v11_0_set_hw_resources_1, r=%d\n", r);<br>
> + goto failure;<br>
> + }<br>
> }<br>
><br>
> r = mes_v11_0_query_sched_status(&adev->mes);<br>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c<br>
> index 68bef36aae3b8..4b78e05a4615e 100644<br>
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c<br>
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c<br>
> @@ -1736,7 +1736,8 @@ static int mes_v12_0_hw_init(struct amdgpu_ip_block *ip_block)<br>
> if (r)<br>
> goto failure;<br>
><br>
> - mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);<br>
> + if ((adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x4b)<br>
> + mes_v12_0_set_hw_resources_1(&adev->mes, AMDGPU_MES_SCHED_PIPE);<br>
><br>
> mes_v12_0_init_aggregated_doorbell(&adev->mes);<br>
><br>
> --<br>
> 2.49.0<br>
><br>
</div>
</span></font></div>
</div>
</body>
</html>