Commit 755f32a3 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Convert SMUv13 microcode to use `amdgpu_ucode_ip_version_decode` 



The special case for the one dGPU has been moved into
`amdgpu_ucode_ip_version_decode`, so simplify this code.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6b544962

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

+2 −10
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static const int link_speed[] = {25, 50, 80, 160}; 
int smu_v13_0_init_microcode(struct smu_context *smu)

{

	struct amdgpu_device *adev = smu->adev;

	const char *chip_name;

	char fw_name[30];

	char ucode_prefix[30];

	int err = 0;
@@ -100,16 +99,9 @@ int smu_v13_0_init_microcode(struct smu_context *smu) 
	if (amdgpu_sriov_vf(adev))

		return 0;



	switch (adev->ip_versions[MP1_HWIP][0]) {

	case IP_VERSION(13, 0, 2):

		chip_name = "aldebaran_smc";

		break;

	default:

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

		chip_name = ucode_prefix;

	}



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

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



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

	if (err)