Commit 23fc9479 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amdgpu: refine gfx9 firmware loading 



refine gfx9 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 de324625

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

+22 −23
Original line number Diff line number Diff line
@@ -1378,23 +1378,22 @@ static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev) 
static int gfx_v9_0_init_cp_gfx_microcode(struct amdgpu_device *adev,

					  char *chip_name)

{

	char fw_name[50];

	int err;



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

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

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

				   "amdgpu/%s_pfp.bin", chip_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_PFP);



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

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

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

				   "amdgpu/%s_me.bin", chip_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_ME);



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

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

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

				   "amdgpu/%s_ce.bin", chip_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);
@@ -1411,7 +1410,6 @@ static int gfx_v9_0_init_cp_gfx_microcode(struct amdgpu_device *adev, 
static int gfx_v9_0_init_rlc_microcode(struct amdgpu_device *adev,

				       char *chip_name)

{

	char fw_name[53];

	int err;

	const struct rlc_firmware_header_v2_0 *rlc_hdr;

	uint16_t version_major;
@@ -1429,20 +1427,22 @@ static int gfx_v9_0_init_rlc_microcode(struct amdgpu_device *adev, 
	if (!strcmp(chip_name, "picasso") &&

		(((adev->pdev->revision >= 0xC8) && (adev->pdev->revision <= 0xCF)) ||

		((adev->pdev->revision >= 0xD8) && (adev->pdev->revision <= 0xDF))))

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

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

					   "amdgpu/%s_rlc_am4.bin", chip_name);

	else if (!strcmp(chip_name, "raven") && (amdgpu_pm_load_smu_firmware(adev, &smu_version) == 0) &&

		(smu_version >= 0x41e2b))

		/**

		*SMC is loaded by SBIOS on APU and it's able to get the SMU version directly.

		*/

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

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

					   "amdgpu/%s_kicker_rlc.bin", chip_name);

	else

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

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

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

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

	if (err)

		goto out;

	rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;



	rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;

	version_major = le16_to_cpu(rlc_hdr->header.header_version_major);

	version_minor = le16_to_cpu(rlc_hdr->header.header_version_minor);

	err = amdgpu_gfx_rlc_init_microcode(adev, version_major, version_minor);
@@ -1466,28 +1466,27 @@ static bool gfx_v9_0_load_mec2_fw_bin_support(struct amdgpu_device *adev) 
static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev,

					      char *chip_name)

{

	char fw_name[50];

	int err;



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

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

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

					   "amdgpu/%s_sjt_mec.bin", chip_name);

	else

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



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

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

					   "amdgpu/%s_mec.bin", chip_name);

	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);



	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);

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

						   "amdgpu/%s_sjt_mec2.bin", chip_name);

		else

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



		/* ignore failures to load */

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

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

						   "amdgpu/%s_mec2.bin", chip_name);

		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);

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

+4 −7
Original line number Diff line number Diff line
@@ -372,15 +372,14 @@ static void gfx_v9_4_3_free_microcode(struct amdgpu_device *adev) 
static int gfx_v9_4_3_init_rlc_microcode(struct amdgpu_device *adev,

					  const char *chip_name)

{

	char fw_name[30];

	int err;

	const struct rlc_firmware_header_v2_0 *rlc_hdr;

	uint16_t version_major;

	uint16_t version_minor;



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



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

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

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

	if (err)

		goto out;

	rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;
@@ -409,12 +408,10 @@ static void gfx_v9_4_3_check_if_need_gfxoff(struct amdgpu_device *adev) 
static int gfx_v9_4_3_init_cp_compute_microcode(struct amdgpu_device *adev,

					  const char *chip_name)

{

	char fw_name[30];

	int err;



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



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

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

				   "amdgpu/%s_mec.bin", chip_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1);