Commit 30b59910 authored Jun 30, 2023 by YuanShang Committed by Alex Deucher Jul 25, 2023

drm/amdgpu: load sdma ucode in the guest machine



[why]
User mode driver need to check the sdma ucode version to
see whether the sdma engine supports a new type of PM4 packet.
In SRIOV, sdma is loaded by the host. And, there is no way
to check the sdma ucode version of CHIP_NAVI12 and
CHIP_SIENNA_CICHLID of the host in the guest machine.

[how]
Load the sdma ucode for CHIP_NAVI12 and CHIP_SIENNA_CICHLID
in the guest machine.

Signed-off-by: YuanShang <YuanShang.Mao@amd.com>
Reviewed-By: Horace Chen <horace.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent fc8e55f3

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -239,9 +239,6 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
		sizeof(struct amdgpu_sdma_instance));
		}

		if (amdgpu_sriov_vf(adev))
		return 0;

		DRM_DEBUG("psp_load == '%s'\n",
		adev->firmware.load_type == AMDGPU_FW_LOAD_PSP ? "true" : "false");

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -855,6 +855,17 @@ bool amdgpu_virt_fw_load_skip_check(struct amdgpu_device *adev, uint32_t ucode_i
		return false;
		else
		return true;
		case IP_VERSION(11, 0, 9):
		case IP_VERSION(11, 0, 7):
		/* black list for CHIP_NAVI12 and CHIP_SIENNA_CICHLID */
		if (ucode_id == AMDGPU_UCODE_ID_RLC_G
		\|\| ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL
		\|\| ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM
		\|\| ucode_id == AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM
		\|\| ucode_id == AMDGPU_UCODE_ID_SMC)
		return true;
		else
		return false;
		case IP_VERSION(13, 0, 10):
		/* white list */
		if (ucode_id == AMDGPU_UCODE_ID_CAP

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -237,10 +237,8 @@ static void sdma_v5_0_init_golden_registers(struct amdgpu_device *adev)
		// emulation only, won't work on real chip
		// navi10 real chip need to use PSP to load firmware
		static int sdma_v5_0_init_microcode(struct amdgpu_device *adev)
		{ int ret, i;

		if (amdgpu_sriov_vf(adev) && (adev->ip_versions[SDMA0_HWIP][0] == IP_VERSION(5, 0, 5)))
		return 0;
		{
		int ret, i;

		for (i = 0; i < adev->sdma.num_instances; i++) {
		ret = amdgpu_sdma_init_microcode(adev, i, false);