diff options
author | yanyang1 <Young.Yang@amd.com> | 2016-02-05 04:39:37 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-04 20:26:19 -0400 |
commit | 735f002b14b4f532348cabddddc003c7858e8f30 (patch) | |
tree | 78c670102fce2eb3ce4c02a64bbdc157b40750e0 /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
parent | 92c6d645ee19819dd5b63a171ac7ef7abeb3d21b (diff) |
drm/amd/amdgpu: Add smc_sk firmware in baffin & ellesmere.
add CGS_UCODE_ID_SMU_SK.
Signed-off-by: yanyang1 <Young.Yang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 8bc4040d18cf..594159c7525b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
@@ -702,7 +702,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, | |||
702 | { | 702 | { |
703 | CGS_FUNC_ADEV; | 703 | CGS_FUNC_ADEV; |
704 | 704 | ||
705 | if (CGS_UCODE_ID_SMU != type) { | 705 | if ((CGS_UCODE_ID_SMU != type) && (CGS_UCODE_ID_SMU_SK != type)) { |
706 | uint64_t gpu_addr; | 706 | uint64_t gpu_addr; |
707 | uint32_t data_size; | 707 | uint32_t data_size; |
708 | const struct gfx_firmware_header_v1_0 *header; | 708 | 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 | strcpy(fw_name, "amdgpu/fiji_smc.bin"); | 743 | strcpy(fw_name, "amdgpu/fiji_smc.bin"); |
744 | break; | 744 | break; |
745 | case CHIP_BAFFIN: | 745 | case CHIP_BAFFIN: |
746 | strcpy(fw_name, "amdgpu/baffin_smc.bin"); | 746 | if (type == CGS_UCODE_ID_SMU) |
747 | strcpy(fw_name, "amdgpu/baffin_smc.bin"); | ||
748 | else if (type == CGS_UCODE_ID_SMU_SK) | ||
749 | strcpy(fw_name, "amdgpu/baffin_smc_sk.bin"); | ||
747 | break; | 750 | break; |
748 | case CHIP_ELLESMERE: | 751 | case CHIP_ELLESMERE: |
749 | strcpy(fw_name, "amdgpu/ellesmere_smc.bin"); | 752 | if (type == CGS_UCODE_ID_SMU) |
753 | strcpy(fw_name, "amdgpu/ellesmere_smc.bin"); | ||
754 | else if (type == CGS_UCODE_ID_SMU_SK) | ||
755 | strcpy(fw_name, "amdgpu/ellesmere_smc_sk.bin"); | ||
750 | break; | 756 | break; |
751 | default: | 757 | default: |
752 | DRM_ERROR("SMC firmware not supported\n"); | 758 | DRM_ERROR("SMC firmware not supported\n"); |