diff options
author | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |
parent | serial: 8250: Add new port type for TI DA8xx/66AK2x (diff) | |
parent | Linux 4.10-rc4 (diff) | |
download | kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.gz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.xz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.zip |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 0daac3a5be79..476bc9f1954b 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -46,6 +46,7 @@ static int gmc_v8_0_wait_for_idle(void *handle); MODULE_FIRMWARE("amdgpu/tonga_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris11_mc.bin"); MODULE_FIRMWARE("amdgpu/polaris10_mc.bin"); +MODULE_FIRMWARE("amdgpu/polaris12_mc.bin"); static const u32 golden_settings_tonga_a11[] = { @@ -130,6 +131,7 @@ static void gmc_v8_0_init_golden_registers(struct amdgpu_device *adev) (const u32)ARRAY_SIZE(golden_settings_tonga_a11)); break; case CHIP_POLARIS11: + case CHIP_POLARIS12: amdgpu_program_register_sequence(adev, golden_settings_polaris11_a11, (const u32)ARRAY_SIZE(golden_settings_polaris11_a11)); @@ -225,6 +227,9 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) case CHIP_POLARIS10: chip_name = "polaris10"; break; + case CHIP_POLARIS12: + chip_name = "polaris12"; + break; case CHIP_FIJI: case CHIP_CARRIZO: case CHIP_STONEY: |