mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 11:03:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/amdgpu/cgs: Avoid redundant copying of firmware filename

Browse Source 
While at it, remove redundant error message - request_firmware() will
log a failure anyway.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: George Zhang <george.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michał Mirosław
2026-07-02 18:24:40 +02:00
committed by Alex Deucher
parent 0d2d656dfe
commit bd2c949e5e
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
View File

@@ -239,7 +239,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
info->fw_version = amdgpu_get_firmware_version(cgs_device, type);
info->feature_version = (uint16_t)le32_to_cpu(header->ucode_feature_version);
} else {
char fw_name[30] = {0};
const char *fw_name = NULL;
int err = 0;
uint32_t ucode_size;
uint32_t ucode_start_address;
@@ -255,17 +255,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
(adev->pdev->revision == 0x81) ||
(adev->pdev->device == 0x665f)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/bonaire_k_smc.bin");
fw_name = "bonaire_k_smc.bin";
} else {
strscpy(fw_name, "amdgpu/bonaire_smc.bin");
fw_name = "bonaire_smc.bin";
}
break;
case CHIP_HAWAII:
if (adev->pdev->revision == 0x80) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/hawaii_k_smc.bin");
fw_name = "hawaii_k_smc.bin";
} else {
strscpy(fw_name, "amdgpu/hawaii_smc.bin");
fw_name = "hawaii_smc.bin";
}
break;
case CHIP_TOPAZ:
@@ -275,76 +275,76 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD1)) ||
((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0xD3))) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/topaz_k_smc.bin");
fw_name = "topaz_k_smc.bin";
} else
strscpy(fw_name, "amdgpu/topaz_smc.bin");
fw_name = "topaz_smc.bin";
break;
case CHIP_TONGA:
if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) ||
((adev->pdev->device == 0x6938) && (adev->pdev->revision == 0xf1))) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/tonga_k_smc.bin");
fw_name = "tonga_k_smc.bin";
} else
strscpy(fw_name, "amdgpu/tonga_smc.bin");
fw_name = "tonga_smc.bin";
break;
case CHIP_FIJI:
strscpy(fw_name, "amdgpu/fiji_smc.bin");
fw_name = "fiji_smc.bin";
break;
case CHIP_POLARIS11:
if (type == CGS_UCODE_ID_SMU) {
if (ASICID_IS_P21(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/polaris11_k_smc.bin");
fw_name = "polaris11_k_smc.bin";
} else if (ASICID_IS_P31(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/polaris11_k2_smc.bin");
fw_name = "polaris11_k2_smc.bin";
} else {
strscpy(fw_name, "amdgpu/polaris11_smc.bin");
fw_name = "polaris11_smc.bin";
}
} else if (type == CGS_UCODE_ID_SMU_SK) {
strscpy(fw_name, "amdgpu/polaris11_smc_sk.bin");
fw_name = "polaris11_smc_sk.bin";
}
break;
case CHIP_POLARIS10:
if (type == CGS_UCODE_ID_SMU) {
if (ASICID_IS_P20(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/polaris10_k_smc.bin");
fw_name = "polaris10_k_smc.bin";
} else if (ASICID_IS_P30(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/polaris10_k2_smc.bin");
fw_name = "polaris10_k2_smc.bin";
} else {
strscpy(fw_name, "amdgpu/polaris10_smc.bin");
fw_name = "polaris10_smc.bin";
}
} else if (type == CGS_UCODE_ID_SMU_SK) {
strscpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
fw_name = "polaris10_smc_sk.bin";
}
break;
case CHIP_POLARIS12:
if (ASICID_IS_P23(adev->pdev->device, adev->pdev->revision)) {
info->is_kicker = true;
strscpy(fw_name, "amdgpu/polaris12_k_smc.bin");
fw_name = "polaris12_k_smc.bin";
} else {
strscpy(fw_name, "amdgpu/polaris12_smc.bin");
fw_name = "polaris12_smc.bin";
}
break;
case CHIP_VEGAM:
strscpy(fw_name, "amdgpu/vegam_smc.bin");
fw_name = "vegam_smc.bin";
break;
case CHIP_VEGA10:
if ((adev->pdev->device == 0x687f) &&
((adev->pdev->revision == 0xc0) ||
(adev->pdev->revision == 0xc1) ||
(adev->pdev->revision == 0xc3)))
strscpy(fw_name, "amdgpu/vega10_acg_smc.bin");
fw_name = "vega10_acg_smc.bin";
else
strscpy(fw_name, "amdgpu/vega10_smc.bin");
fw_name = "vega10_smc.bin";
break;
case CHIP_VEGA12:
strscpy(fw_name, "amdgpu/vega12_smc.bin");
fw_name = "vega12_smc.bin";
break;
case CHIP_VEGA20:
strscpy(fw_name, "amdgpu/vega20_smc.bin");
fw_name = "vega20_smc.bin";
break;
default:
drm_err(adev_to_drm(adev), "SMC firmware not supported\n");
@@ -353,10 +353,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
err = amdgpu_ucode_request(adev, &adev->pm.fw,
AMDGPU_UCODE_REQUIRED,
"%s", fw_name);
"amdgpu/%s", fw_name);
if (err) {
drm_err(adev_to_drm(adev),
"Failed to load firmware \"%s\"\n", fw_name);
amdgpu_ucode_release(&adev->pm.fw);
return err;
}