Commit 735f002b authored by yanyang1's avatar yanyang1 Committed by Alex Deucher

drm/amd/amdgpu: Add smc_sk firmware in baffin & ellesmere.

add CGS_UCODE_ID_SMU_SK.
Signed-off-by: default avataryanyang1 <Young.Yang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92c6d645
...@@ -702,7 +702,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, ...@@ -702,7 +702,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
{ {
CGS_FUNC_ADEV; CGS_FUNC_ADEV;
if (CGS_UCODE_ID_SMU != type) { if ((CGS_UCODE_ID_SMU != type) && (CGS_UCODE_ID_SMU_SK != type)) {
uint64_t gpu_addr; uint64_t gpu_addr;
uint32_t data_size; uint32_t data_size;
const struct gfx_firmware_header_v1_0 *header; const struct gfx_firmware_header_v1_0 *header;
...@@ -743,10 +743,16 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, ...@@ -743,10 +743,16 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
strcpy(fw_name, "amdgpu/fiji_smc.bin"); strcpy(fw_name, "amdgpu/fiji_smc.bin");
break; break;
case CHIP_BAFFIN: case CHIP_BAFFIN:
strcpy(fw_name, "amdgpu/baffin_smc.bin"); if (type == CGS_UCODE_ID_SMU)
strcpy(fw_name, "amdgpu/baffin_smc.bin");
else if (type == CGS_UCODE_ID_SMU_SK)
strcpy(fw_name, "amdgpu/baffin_smc_sk.bin");
break; break;
case CHIP_ELLESMERE: case CHIP_ELLESMERE:
strcpy(fw_name, "amdgpu/ellesmere_smc.bin"); if (type == CGS_UCODE_ID_SMU)
strcpy(fw_name, "amdgpu/ellesmere_smc.bin");
else if (type == CGS_UCODE_ID_SMU_SK)
strcpy(fw_name, "amdgpu/ellesmere_smc_sk.bin");
break; break;
default: default:
DRM_ERROR("SMC firmware not supported\n"); DRM_ERROR("SMC firmware not supported\n");
......
...@@ -94,6 +94,7 @@ enum cgs_voltage_planes { ...@@ -94,6 +94,7 @@ enum cgs_voltage_planes {
*/ */
enum cgs_ucode_id { enum cgs_ucode_id {
CGS_UCODE_ID_SMU = 0, CGS_UCODE_ID_SMU = 0,
CGS_UCODE_ID_SMU_SK,
CGS_UCODE_ID_SDMA0, CGS_UCODE_ID_SDMA0,
CGS_UCODE_ID_SDMA1, CGS_UCODE_ID_SDMA1,
CGS_UCODE_ID_CP_CE, CGS_UCODE_ID_CP_CE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment