Skip to content

Commit 61ca97e

Browse files
ArvindYadavAMDalexdeucher
authored andcommitted
drm/amdgpu/gfx11: Add fw minimum version check for usermode queue
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. v3: Firmware version checks only for Navi3x(by Alex). 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 3f397cd commit 61ca97e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,8 +1631,11 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
16311631
case IP_VERSION(11, 0, 2):
16321632
case IP_VERSION(11, 0, 3):
16331633
#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
1634-
/* add firmware version checks here */
1635-
if (0 && !adev->gfx.disable_uq) {
1634+
if (!adev->gfx.disable_uq &&
1635+
adev->gfx.me_fw_version >= 2390 &&
1636+
adev->gfx.pfp_fw_version >= 2530 &&
1637+
adev->gfx.mec_fw_version >= 2600 &&
1638+
adev->mes.fw_version[0] >= 120) {
16361639
adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
16371640
adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
16381641
}

0 commit comments

Comments
 (0)