Commit 1d32af4f authored by shaoyunl's avatar shaoyunl Committed by Alex Deucher
Browse files

drm/amdgpu: use sjt mec fw on aldebaran for sriov 



The second jump table is required on live migration or mulitple VF
configuration on Aldebaran. With this implemented, the first level
jump table(hw used) will be same, mec fw internal will use the
second level jump table jump to the real functionality implementation.
so the different VF can load different version of MEC as long as
they support sjt

Signed-off-by: default avatarshaoyunl <shaoyun.liu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0a8c91d7

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

+12 −2
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ MODULE_FIRMWARE("amdgpu/green_sardine_rlc.bin"); 
MODULE_FIRMWARE("amdgpu/aldebaran_mec.bin");

MODULE_FIRMWARE("amdgpu/aldebaran_mec2.bin");

MODULE_FIRMWARE("amdgpu/aldebaran_rlc.bin");

MODULE_FIRMWARE("amdgpu/aldebaran_sjt_mec.bin");

MODULE_FIRMWARE("amdgpu/aldebaran_sjt_mec2.bin");



#define mmTCP_CHAN_STEER_0_ARCT								0x0b03

#define mmTCP_CHAN_STEER_0_ARCT_BASE_IDX							0
@@ -1496,7 +1498,11 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 
	const struct common_firmware_header *header = NULL;

	const struct gfx_firmware_header_v1_0 *cp_hdr;



	if (amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_ALDEBARAN))

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sjt_mec.bin", chip_name);

	else

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec.bin", chip_name);



	err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);

	if (err)

		goto out;
@@ -1509,7 +1515,11 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 




	if (gfx_v9_0_load_mec2_fw_bin_support(adev)) {

		if (amdgpu_sriov_vf(adev) && (adev->asic_type == CHIP_ALDEBARAN))

			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sjt_mec2.bin", chip_name);

		else

			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2.bin", chip_name);



		err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);

		if (!err) {

			err = amdgpu_ucode_validate(adev->gfx.mec2_fw);