Re: [PATCH 1/2 v2] drm/amdgpu: Add fw minimum version check for usermode queue

[Yadav, Arvind]

On 4/10/2025 8:50 PM, Alex Deucher wrote:

On Thu, Apr 10, 2025 at 10:57 AM Arvind Yadav <arvind.ya...@amd.com> wrote:

This patch is load usermode queue based on FW support for gfx11.
CP Ucode FW version: [PFP = 2530, ME = 2390, MEC = 2600, MES = 120]

v2: Addressed review comments from Alex.
     - Just check the firmware versions directly.

Cc: Alex Deucher <alexander.deuc...@amd.com>
Cc: Christian Koenig <christian.koe...@amd.com>
Cc: Shashank Sharma <shashank.sha...@amd.com>
Cc: Sunil Khatri <sunil.kha...@amd.com>
Signed-off-by: Arvind Yadav <arvind.ya...@amd.com>
---
  drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 91d29f482c3c..62dcdba589cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -1632,7 +1632,10 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block 
*ip_block)
         case IP_VERSION(11, 0, 3):
  #ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
                 /* add firmware version checks here */
-               if (0) {
+               if (adev->gfx.me_fw_version  >= 2390 &&
+                   adev->gfx.pfp_fw_version >= 2530 &&
+                   adev->gfx.mec_fw_version >= 2600 &&
+                   adev->mes.fw_version[0] >= 120) {
                         adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
                         adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = 
&userq_mes_funcs;
                 }
@@ -1646,7 +1649,10 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block 
*ip_block)
         case IP_VERSION(11, 5, 3):
  #ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
                 /* add firmware version checks here */
-               if (0) {
+               if (adev->gfx.me_fw_version  >= 2390 &&
+                   adev->gfx.pfp_fw_version >= 2530 &&
+                   adev->gfx.mec_fw_version >= 2600 &&
+                   adev->mes.fw_version[0] >= 120) {

Are you sure this is correct?  I didn't think the firmware is ready
yet for these families.

These version is shared by Mario. I have also added you in that mail.
Firmware Type    navi4x    Navi3x
PFP                        2840    2530
ME                         2780    2390
MEC                       3050    2600

~arvind

Alex

                         adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
                         adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = 
&userq_mes_funcs;
                 }
--
2.34.1