Skip to content

Commit dc2631d

Browse files
Jie1zhanggregkh
authored andcommitted
drm/amdgpu/sdma: bump firmware version checks for user queue support
commit 2d41a4b 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: e8cca30 ("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 aab8b68) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6c6eaa2 commit dc2631d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,15 +1376,15 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)
13761376

13771377
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
13781378
case IP_VERSION(6, 0, 0):
1379-
if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
1379+
if ((adev->sdma.instance[0].fw_version >= 27) && !adev->sdma.disable_uq)
13801380
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13811381
break;
13821382
case IP_VERSION(6, 0, 2):
1383-
if ((adev->sdma.instance[0].fw_version >= 21) && !adev->sdma.disable_uq)
1383+
if ((adev->sdma.instance[0].fw_version >= 23) && !adev->sdma.disable_uq)
13841384
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13851385
break;
13861386
case IP_VERSION(6, 0, 3):
1387-
if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
1387+
if ((adev->sdma.instance[0].fw_version >= 27) && !adev->sdma.disable_uq)
13881388
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13891389
break;
13901390
default:

0 commit comments

Comments
 (0)