Commit 3af2c80a authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amdgpu: refine gfx10 firmware loading 



refine gfx10 firmware loading

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 23fc9479

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

+12 −13
Original line number Diff line number Diff line
@@ -4116,7 +4116,6 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev) 


static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)

{

	char fw_name[53];

	char ucode_prefix[30];

	const char *wks = "";

	int err;
@@ -4131,27 +4130,27 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) 
		wks = "_wks";

	amdgpu_ucode_ip_version_decode(adev, GC_HWIP, ucode_prefix, sizeof(ucode_prefix));



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_pfp%s.bin", ucode_prefix, wks);

	err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw,

				   "amdgpu/%s_pfp%s.bin", ucode_prefix, wks);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_PFP);



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_me%s.bin", ucode_prefix, wks);

	err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->gfx.me_fw,

				   "amdgpu/%s_me%s.bin", ucode_prefix, wks);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_ME);



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ce%s.bin", ucode_prefix, wks);

	err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw,

				   "amdgpu/%s_ce%s.bin", ucode_prefix, wks);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);



	if (!amdgpu_sriov_vf(adev)) {

		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);

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

		err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,

					   "amdgpu/%s_rlc.bin", ucode_prefix);

		if (err)

			goto out;
@@ -4166,15 +4165,15 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev) 
			goto out;

	}



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec%s.bin", ucode_prefix, wks);

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

	err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw,

				   "amdgpu/%s_mec%s.bin", ucode_prefix, wks);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1);

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1_JT);



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mec2%s.bin", ucode_prefix, wks);

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

	err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw,

				   "amdgpu/%s_mec2%s.bin", ucode_prefix, wks);

	if (!err) {

		amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2);

		amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2_JT);