drm/amdgpu/sdma: bump firmware version checks for user queue support

commit 2d41a4bfee6e9941ff19728c691ab00d19cf882a upstream.

Using the previous firmware could lead to problems with
PROTECTED_FENCE_SIGNAL commands, specifically causing register
conflicts between MCU_DBG0 and MCU_DBG1.

The updated firmware versions ensure proper alignment
and unification of the SDMA_SUBOP_PROTECTED_FENCE_SIGNAL value with SDMA 7.x,
resolving these hardware coordination issues

Fixes: e8cca30d8b34 ("drm/amdgpu/sdma6: add ucode version checks for userq support")
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit aab8b689aded255425db3d80c0030d1ba02fe2ef)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index 041bca58add556d0599c890a7945419c35df4fec..9ac52eb6f5936098d209aaf543d1d11b38b60ee0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1376,15 +1376,15 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
 
        switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
        case IP_VERSION(6, 0, 0):
-               if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
+               if ((adev->sdma.instance[0].fw_version >= 27) && !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)
+               if ((adev->sdma.instance[0].fw_version >= 23) && !adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
                break;
        case IP_VERSION(6, 0, 3):
-               if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
+               if ((adev->sdma.instance[0].fw_version >= 27) && !adev->sdma.disable_uq)
                        adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
                break;
        default: