[PATCH] drm/amdgpu/sdma6: add more ucode version checks for userq support

[Zhang, Jesse(Jie)]

[AMD Official Use Only - AMD Internal Distribution Only]

this patch is Reviewed-by: Jesse Zhang <Jesse.Zhang at amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Tuesday, June 24, 2025 3:49 AM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: [PATCH] drm/amdgpu/sdma6: add more ucode version checks for userq support

Fill in the SDMA ucode version checks for more SDMA 6.x parts.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index a9bdf8d61d6ce..2f3250d30bb01 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1379,6 +1379,10 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
                if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
                break;
+       case IP_VERSION(6, 0, 1):
+               if ((adev->sdma.instance[0].fw_version >= 18) && !adev->sdma.disable_uq)
+                       adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
+               break;
        case IP_VERSION(6, 0, 2):
                if ((adev->sdma.instance[0].fw_version >= 21) && !adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs; @@ -1387,6 +1391,18 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
                if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
                break;
+       case IP_VERSION(6, 1, 0):
+               if ((adev->sdma.instance[0].fw_version >= 11) && !adev->sdma.disable_uq)
+                       adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
+               break;
+       case IP_VERSION(6, 1, 1):
+               if ((adev->sdma.instance[0].fw_version >= 14) && !adev->sdma.disable_uq)
+                       adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
+               break;
+       case IP_VERSION(6, 1, 2):
+               if ((adev->sdma.instance[0].fw_version >= 12) && !adev->sdma.disable_uq)
+                       adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
+               break;
        default:
                break;
        }
--
2.49.0