Skip to content

Commit 2d41a4b

Browse files
Jie1zhangalexdeucher
authored andcommitted
drm/amdgpu/sdma: bump firmware version checks for user queue support
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
1 parent 42d2abb commit 2d41a4b

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

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

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

13781378
switch (amdgpu_ip_version(adev, SDMA0_HWIP, 0)) {
13791379
case IP_VERSION(6, 0, 0):
1380-
if ((adev->sdma.instance[0].fw_version >= 24) && !adev->sdma.disable_uq)
1380+
if ((adev->sdma.instance[0].fw_version >= 27) && !adev->sdma.disable_uq)
13811381
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13821382
break;
13831383
case IP_VERSION(6, 0, 1):
13841384
if ((adev->sdma.instance[0].fw_version >= 18) && !adev->sdma.disable_uq)
13851385
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13861386
break;
13871387
case IP_VERSION(6, 0, 2):
1388-
if ((adev->sdma.instance[0].fw_version >= 21) && !adev->sdma.disable_uq)
1388+
if ((adev->sdma.instance[0].fw_version >= 23) && !adev->sdma.disable_uq)
13891389
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13901390
break;
13911391
case IP_VERSION(6, 0, 3):
1392-
if ((adev->sdma.instance[0].fw_version >= 25) && !adev->sdma.disable_uq)
1392+
if ((adev->sdma.instance[0].fw_version >= 27) && !adev->sdma.disable_uq)
13931393
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
13941394
break;
13951395
case IP_VERSION(6, 1, 0):

0 commit comments

Comments
 (0)