diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-09 09:47:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-09 09:47:19 +1000 |
| commit | 6edd870bca30b3aa69370a99bcefc1e5f2b8b190 (patch) | |
| tree | 00a11830aa92cca60ddac28911b9d57d353d6ff4 /drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | |
| parent | 6906407eeb690ed31b183a38ae10db2907cc3a58 (diff) | |
| parent | 7192c54a68013f6058b1bb505645fcd07015191c (diff) | |
| download | linux-next-6edd870bca30b3aa69370a99bcefc1e5f2b8b190.tar.gz linux-next-6edd870bca30b3aa69370a99bcefc1e5f2b8b190.zip | |
Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Fixes for 4.10:
- Polaris 12 support
- Add new amd-gfx mailing list to MAINTAINERS file
- UVD clockgating fix
- SI dpm fixes
* 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: drop verde dpm quirks
drm/radeon: drop verde dpm quirks
drm/radeon: update smc firmware selection for SI
drm/amdgpu: update si kicker smc firmware
drm/amd/powerplay: extend smu's response timeout time.
drm/amdgpu: remove static integer for uvd pp state
drm/amd/amdgpu: add Polaris12 PCI ID
drm/amdgpu/powerplay: add Polaris12 support
drm/amd/amdgpu: add Polaris12 support (v3)
MAINTAINERS: Update mailing list for radeon and amdgpu
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c index 9ada56c16a58..4c851fde1e82 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -840,6 +840,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, else if (type == CGS_UCODE_ID_SMU_SK) strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin"); break; + case CHIP_POLARIS12: + strcpy(fw_name, "amdgpu/polaris12_smc.bin"); + break; default: DRM_ERROR("SMC firmware not supported\n"); return -EINVAL; |