[PATCH] drm/amdgpu/sdma6: fix user queue firmware version check

[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: Saturday, June 28, 2025 12:46 AM
To: amd-gfx at lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: [PATCH] drm/amdgpu/sdma6: fix user queue firmware version check

Some of the versions were incorrect and add support for 6.1.3.

Fixes: 3de84812c702 ("drm/amdgpu/sdma6: add more ucode version checks for userq support")
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 2f3250d30bb01..273f9a1567761 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1392,15 +1392,19 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
                        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)
+               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, 1):
-               if ((adev->sdma.instance[0].fw_version >= 14) && !adev->sdma.disable_uq)
+               if ((adev->sdma.instance[0].fw_version >= 17) &&
+!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)
+               if ((adev->sdma.instance[0].fw_version >= 15) && !adev->sdma.disable_uq)
+                       adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
+               break;
+       case IP_VERSION(6, 1, 3):
+               if ((adev->sdma.instance[0].fw_version >= 10) &&
+!adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
                break;
        default:
--
2.50.0