diff options
author | Flora Cui <Flora.Cui@amd.com> | 2016-03-14 18:33:29 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-04 20:27:57 -0400 |
commit | 2cc0c0b5cd4d07a65267c28a4f7b68134abff472 (patch) | |
tree | 6f989d1e7fb5706e171c08881720ba8da8734bfc /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
parent | a3ad7a9ad8ef2e87ffa7e65d6ce0e9928b4134e9 (diff) |
drm/amdgpu: change ELM/BAF to Polaris10/Polaris11
Adjust to preferred code names.
Signed-off-by: Flora Cui <Flora.Cui@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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index e0668173fc1a..837cdd2a6a2b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
@@ -681,8 +681,8 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type) | |||
681 | result = AMDGPU_UCODE_ID_CP_MEC1; | 681 | result = AMDGPU_UCODE_ID_CP_MEC1; |
682 | break; | 682 | break; |
683 | case CGS_UCODE_ID_CP_MEC_JT2: | 683 | case CGS_UCODE_ID_CP_MEC_JT2: |
684 | if (adev->asic_type == CHIP_TONGA || adev->asic_type == CHIP_BAFFIN | 684 | if (adev->asic_type == CHIP_TONGA || adev->asic_type == CHIP_POLARIS11 |
685 | || adev->asic_type == CHIP_ELLESMERE) | 685 | || adev->asic_type == CHIP_POLARIS10) |
686 | result = AMDGPU_UCODE_ID_CP_MEC2; | 686 | result = AMDGPU_UCODE_ID_CP_MEC2; |
687 | else | 687 | else |
688 | result = AMDGPU_UCODE_ID_CP_MEC1; | 688 | result = AMDGPU_UCODE_ID_CP_MEC1; |
@@ -742,17 +742,17 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, | |||
742 | case CHIP_FIJI: | 742 | case CHIP_FIJI: |
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_POLARIS11: |
746 | if (type == CGS_UCODE_ID_SMU) | 746 | if (type == CGS_UCODE_ID_SMU) |
747 | strcpy(fw_name, "amdgpu/baffin_smc.bin"); | 747 | strcpy(fw_name, "amdgpu/polaris11_smc.bin"); |
748 | else if (type == CGS_UCODE_ID_SMU_SK) | 748 | else if (type == CGS_UCODE_ID_SMU_SK) |
749 | strcpy(fw_name, "amdgpu/baffin_smc_sk.bin"); | 749 | strcpy(fw_name, "amdgpu/polaris11_smc_sk.bin"); |
750 | break; | 750 | break; |
751 | case CHIP_ELLESMERE: | 751 | case CHIP_POLARIS10: |
752 | if (type == CGS_UCODE_ID_SMU) | 752 | if (type == CGS_UCODE_ID_SMU) |
753 | strcpy(fw_name, "amdgpu/ellesmere_smc.bin"); | 753 | strcpy(fw_name, "amdgpu/polaris10_smc.bin"); |
754 | else if (type == CGS_UCODE_ID_SMU_SK) | 754 | else if (type == CGS_UCODE_ID_SMU_SK) |
755 | strcpy(fw_name, "amdgpu/ellesmere_smc_sk.bin"); | 755 | strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin"); |
756 | break; | 756 | break; |
757 | default: | 757 | default: |
758 | DRM_ERROR("SMC firmware not supported\n"); | 758 | DRM_ERROR("SMC firmware not supported\n"); |