On Tue, Mar 25, 2025 at 3:54 PM Rodrigo Siqueira <sique...@igalia.com> wrote: > > On 03/25, Alex Deucher wrote: > > Drop the cgs smu firmware code for SI, it's not used. > > The smu firmware fetching for SI is done in si_dpm.c. > > > > Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 61 ------------------------- > > 1 file changed, 61 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > > b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > > index 525e53c94f4f5..004a6a9d6b9fa 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c > > @@ -252,67 +252,6 @@ static int amdgpu_cgs_get_firmware_info(struct > > cgs_device *cgs_device, > > > > if (!adev->pm.fw) { > > switch (adev->asic_type) { > > - case CHIP_TAHITI: > > - strscpy(fw_name, "radeon/tahiti_smc.bin"); > > - break; > > - case CHIP_PITCAIRN: > > - if ((adev->pdev->revision == 0x81) && > > - ((adev->pdev->device == 0x6810) || > > - (adev->pdev->device == 0x6811))) { > > - info->is_kicker = true; > > - strscpy(fw_name, > > "radeon/pitcairn_k_smc.bin"); > > - } else { > > - strscpy(fw_name, > > "radeon/pitcairn_smc.bin"); > > - } > > - break; > > - case CHIP_VERDE: > > - if (((adev->pdev->device == 0x6820) && > > - ((adev->pdev->revision == 0x81) || > > - (adev->pdev->revision == 0x83))) || > > - ((adev->pdev->device == 0x6821) && > > - ((adev->pdev->revision == 0x83) || > > - (adev->pdev->revision == 0x87))) || > > - ((adev->pdev->revision == 0x87) && > > - ((adev->pdev->device == 0x6823) || > > - (adev->pdev->device == 0x682b)))) { > > - info->is_kicker = true; > > - strscpy(fw_name, > > "radeon/verde_k_smc.bin"); > > - } else { > > - strscpy(fw_name, > > "radeon/verde_smc.bin"); > > - } > > - break; > > - case CHIP_OLAND: > > - if (((adev->pdev->revision == 0x81) && > > - ((adev->pdev->device == 0x6600) || > > - (adev->pdev->device == 0x6604) || > > - (adev->pdev->device == 0x6605) || > > - (adev->pdev->device == 0x6610))) || > > - ((adev->pdev->revision == 0x83) && > > - (adev->pdev->device == 0x6610))) { > > - info->is_kicker = true; > > - strscpy(fw_name, > > "radeon/oland_k_smc.bin"); > > - } else { > > - strscpy(fw_name, > > "radeon/oland_smc.bin"); > > - } > > - break; > > - case CHIP_HAINAN: > > - if (((adev->pdev->revision == 0x81) && > > - (adev->pdev->device == 0x6660)) || > > - ((adev->pdev->revision == 0x83) && > > - ((adev->pdev->device == 0x6660) || > > - (adev->pdev->device == 0x6663) || > > - (adev->pdev->device == 0x6665) || > > - (adev->pdev->device == 0x6667)))) { > > - info->is_kicker = true; > > - strscpy(fw_name, > > "radeon/hainan_k_smc.bin"); > > - } else if ((adev->pdev->revision == 0xc3) && > > - (adev->pdev->device == 0x6665)) { > > - info->is_kicker = true; > > - strscpy(fw_name, > > "radeon/banks_k_2_smc.bin"); > > - } else { > > - strscpy(fw_name, > > "radeon/hainan_smc.bin"); > > - } > > - break; > > case CHIP_BONAIRE: > > Is there any specific reason why the other ASICs in this switch > (Bonaire, Hawaii, etc) are not using a similar mechanism like si_dpm.c?
Not really. Someone could move the firmware set up into the relevant SMU code for those chips. Alex > > Anyway, > > Reviewed-by: Rodrigo Siqueira <sique...@igalia.com> > > Thanks > > > if ((adev->pdev->revision == 0x80) || > > (adev->pdev->revision == 0x81) || > > -- > > 2.49.0 > > > > -- > Rodrigo Siqueira