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

drm/amdgpu: refine pmfw/smu firmware loading 



refine pmfw/smu 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 cd093c24

drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c

+3 −5
Original line number Diff line number Diff line
@@ -7648,7 +7648,6 @@ static int si_dpm_late_init(void *handle) 
static int si_dpm_init_microcode(struct amdgpu_device *adev)

{

	const char *chip_name;

	char fw_name[30];

	int err;



	DRM_DEBUG("\n");
@@ -7708,11 +7707,10 @@ static int si_dpm_init_microcode(struct amdgpu_device *adev) 
	default: BUG();

	}



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

	err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->pm.fw, "amdgpu/%s_smc.bin", chip_name);

	if (err) {

		DRM_ERROR("si_smc: Failed to load firmware. err = %d\"%s\"\n",

			  err, fw_name);

		DRM_ERROR("si_smc: Failed to load firmware. err = %d\"%s_smc.bin\"\n",

			  err, chip_name);

		amdgpu_ucode_release(&adev->pm.fw);

	}

	return err;

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

+1 −5
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ int smu_v11_0_init_microcode(struct smu_context *smu) 
{

	struct amdgpu_device *adev = smu->adev;

	char ucode_prefix[25];

	char fw_name[SMU_FW_NAME_LEN];

	int err = 0;

	const struct smc_firmware_header_v1_0 *hdr;

	const struct common_firmware_header *header;
@@ -106,10 +105,7 @@ int smu_v11_0_init_microcode(struct smu_context *smu) 
		return 0;



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



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



	err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->pm.fw, "amdgpu/%s.bin", ucode_prefix);

	if (err)

		goto out;

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

+1 −5
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ const int pmfw_decoded_link_width[7] = {0, 1, 2, 4, 8, 12, 16}; 
int smu_v13_0_init_microcode(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;

	char fw_name[30];

	char ucode_prefix[15];

	int err = 0;

	const struct smc_firmware_header_v1_0 *hdr;
@@ -104,10 +103,7 @@ int smu_v13_0_init_microcode(struct smu_context *smu) 
		return 0;



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



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



	err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->pm.fw, "amdgpu/%s.bin", ucode_prefix);

	if (err)

		goto out;

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+1 −5
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ static int smu_v13_0_6_init_microcode(struct smu_context *smu) 
	uint32_t p2s_table_id = P2S_TABLE_ID_A;

	int ret = 0, i, p2stable_count;

	char ucode_prefix[15];

	char fw_name[30];



	/* No need to load P2S tables in IOV mode */

	if (amdgpu_sriov_vf(adev))
@@ -283,10 +282,7 @@ static int smu_v13_0_6_init_microcode(struct smu_context *smu) 


	amdgpu_ucode_ip_version_decode(adev, MP1_HWIP, ucode_prefix,

				       sizeof(ucode_prefix));



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



	ret = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

	ret  = amdgpu_ucode_request(adev, &adev->pm.fw, "amdgpu/%s.bin", ucode_prefix);

	if (ret)

		goto out;

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

+1 −5
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ MODULE_FIRMWARE("amdgpu/smu_14_0_3.bin"); 
int smu_v14_0_init_microcode(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;

	char fw_name[30];

	char ucode_prefix[15];

	int err = 0;

	const struct smc_firmware_header_v1_0 *hdr;
@@ -80,10 +79,7 @@ int smu_v14_0_init_microcode(struct smu_context *smu) 
		return 0;



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



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



	err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

	err = amdgpu_ucode_request(adev, &adev->pm.fw, "amdgpu/%s.bin", ucode_prefix);

	if (err)

		goto out;