Commit 2d41a4bf authored by Jesse.Zhang's avatar Jesse.Zhang Committed by Alex Deucher
Browse files

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: e8cca30d ("drm/amdgpu/sdma6: add ucode version checks for userq support")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit aab8b689)
Cc: stable@vger.kernel.org
parent 42d2abbf

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

+3 −3
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ 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, 1):
@@ -1385,11 +1385,11 @@ 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, 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;

	case IP_VERSION(6, 1, 0):