Skip to content

Commit 9a4ab40

Browse files
vizhaoalexdeucher
authored andcommitted
drm/amdgpu: use sjt mec fw on gfx943 for sriov
Use second jump table in sriov for live migration or mulitple VF support so different VF can load different version of MEC as long as they support sjt Signed-off-by: Victor Zhao <[email protected]> Reviewed-by: Yang Wang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 9f4ddfd commit 9a4ab40

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ MODULE_FIRMWARE("amdgpu/gc_9_4_3_mec.bin");
4545
MODULE_FIRMWARE("amdgpu/gc_9_4_4_mec.bin");
4646
MODULE_FIRMWARE("amdgpu/gc_9_4_3_rlc.bin");
4747
MODULE_FIRMWARE("amdgpu/gc_9_4_4_rlc.bin");
48+
MODULE_FIRMWARE("amdgpu/gc_9_4_3_sjt_mec.bin");
49+
MODULE_FIRMWARE("amdgpu/gc_9_4_4_sjt_mec.bin");
4850

4951
#define GFX9_MEC_HPD_SIZE 4096
5052
#define RLCG_UCODE_LOADING_START_ADDRESS 0x00002000L
@@ -574,8 +576,12 @@ static int gfx_v9_4_3_init_cp_compute_microcode(struct amdgpu_device *adev,
574576
{
575577
int err;
576578

577-
err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
578-
"amdgpu/%s_mec.bin", chip_name);
579+
if (amdgpu_sriov_vf(adev))
580+
err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
581+
"amdgpu/%s_sjt_mec.bin", chip_name);
582+
else
583+
err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,
584+
"amdgpu/%s_mec.bin", chip_name);
579585
if (err)
580586
goto out;
581587
amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1);

0 commit comments

Comments
 (0)