Skip to content

Commit cade59a

Browse files
ArvindYadavAMDalexdeucher
authored andcommitted
drm/amdgpu/gfx12: Add fw minimum version check for usermode queue
This patch is load usermode queue based on FW support for gfx12. CP Ucode FW Vesion: [PFP = 2840, ME = 2780, MEC = 3050, MES = 123] v2: Addressed review comments from Alex - Just check the firmware versions directly. Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Christian Koenig <christian.koenig@amd.com> Cc: Shashank Sharma <shashank.sharma@amd.com> Cc: Sunil Khatri <sunil.khatri@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Sunil Khatri <sunil.khatri@amd.com> Signed-off-by: Arvind Yadav <Arvind.Yadav@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 61ca97e commit cade59a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,8 +1417,11 @@ static int gfx_v12_0_sw_init(struct amdgpu_ip_block *ip_block)
14171417
case IP_VERSION(12, 0, 0):
14181418
case IP_VERSION(12, 0, 1):
14191419
#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
1420-
/* add firmware version checks here */
1421-
if (0 && !adev->gfx.disable_uq) {
1420+
if (!adev->gfx.disable_uq &&
1421+
adev->gfx.me_fw_version >= 2780 &&
1422+
adev->gfx.pfp_fw_version >= 2840 &&
1423+
adev->gfx.mec_fw_version >= 3050 &&
1424+
adev->mes.fw_version[0] >= 123) {
14221425
adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
14231426
adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
14241427
}

0 commit comments

Comments
 (0)