Skip to content

Commit 899dec4

Browse files
committed
drm/amdgpu/sdma6: add ucode version checks for userq support
SDMA 6.0.0 version 24 SDMA 6.0.2 version 21 SDMA 6.0.3 version 25 Reviewed-by: Jesse Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit e8cca30)
1 parent 73eab78 commit 899dec4

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,9 +1374,22 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
13741374
else
13751375
DRM_ERROR("Failed to allocated memory for SDMA IP Dump\n");
13761376

1377-
/* add firmware version checks here */
1378-
if (0 && !adev->sdma.disable_uq)
1379-
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1377+
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
1378+
case IP_VERSION(6, 0, 0):
1379+
if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
1380+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1381+
break;
1382+
case IP_VERSION(6, 0, 2):
1383+
if ((adev->sdma.instance[0].fw_version >= 21) && !adev->sdma.disable_uq)
1384+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1385+
break;
1386+
case IP_VERSION(6, 0, 3):
1387+
if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
1388+
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
1389+
break;
1390+
default:
1391+
break;
1392+
}
13801393

13811394
r = amdgpu_sdma_sysfs_reset_mask_init(adev);
13821395
if (r)

0 commit comments

Comments
 (0)