diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2016-10-27 18:33:00 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-28 15:26:51 -0400 |
commit | 3b496626ee8f07919256a4e99cddf42ecd4ba891 (patch) | |
tree | b275af9d46e35e4665cdd2cf77f9a6bb256799ab /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
parent | 646cccb55b26b95b981ea9a63512260d0c21cac3 (diff) |
drm/amdgpu: add support for new smc firmware on iceland
Newer iceland parts require new smc firmware.
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index d1267ea1d631..662976292535 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |||
@@ -795,7 +795,12 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, | |||
795 | if (!adev->pm.fw) { | 795 | if (!adev->pm.fw) { |
796 | switch (adev->asic_type) { | 796 | switch (adev->asic_type) { |
797 | case CHIP_TOPAZ: | 797 | case CHIP_TOPAZ: |
798 | strcpy(fw_name, "amdgpu/topaz_smc.bin"); | 798 | if (((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x81)) || |
799 | ((adev->pdev->device == 0x6900) && (adev->pdev->revision == 0x83)) || | ||
800 | ((adev->pdev->device == 0x6907) && (adev->pdev->revision == 0x87))) | ||
801 | strcpy(fw_name, "amdgpu/topaz_k_smc.bin"); | ||
802 | else | ||
803 | strcpy(fw_name, "amdgpu/topaz_smc.bin"); | ||
799 | break; | 804 | break; |
800 | case CHIP_TONGA: | 805 | case CHIP_TONGA: |
801 | if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) || | 806 | if (((adev->pdev->device == 0x6939) && (adev->pdev->revision == 0xf1)) || |