diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:21:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 09:21:25 +0200 |
| commit | 96fb7e256a0650c2b37768c780bf0f680b0049b6 (patch) | |
| tree | fa6459ef844e2031466bbe71ded369b8b7aed368 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | eventpoll.h: add missing epoll event masks (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-dev-96fb7e256a0650c2b37768c780bf0f680b0049b6.tar.xz linux-dev-96fb7e256a0650c2b37768c780bf0f680b0049b6.zip | |
Merge 4.11-rc4 into driver-core-next
We want the fixes in here for merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index f7adbace428a..b76cd699eb0d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -421,6 +421,7 @@ static const struct pci_device_id pciidlist[] = { {0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, {0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, {0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, {0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, {0, 0, 0} |