xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 1c90797565385426ad63bd2108085c8466695c0b
Author: Sonny Jiang <sonny.jiang at amd.com>
Date:   Mon Mar 28 16:36:50 2016 +0900

    DRI2: add Polaris PCI IDs
    
    Signed-off-by: Sonny Jiang <sonny.jiang at amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com> (Polaris10)
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com> (Polaris11)
    
    (Ported from Mesa commit f00c840578a70e479ffb99f6b64c73dc420179fa)
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h b/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
index bcf15a1..4df8e9d 100644
--- a/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
@@ -182,4 +182,14 @@ CHIPSET(0x9877, CARRIZO_, CARRIZO)
 
 CHIPSET(0x7300, FIJI_, FIJI)
 
+CHIPSET(0x67E0, POLARIS11_, POLARIS11)
+CHIPSET(0x67E1, POLARIS11_, POLARIS11)
+CHIPSET(0x67E8, POLARIS11_, POLARIS11)
+CHIPSET(0x67E9, POLARIS11_, POLARIS11)
+CHIPSET(0x67EB, POLARIS11_, POLARIS11)
+CHIPSET(0x67FF, POLARIS11_, POLARIS11)
+
+CHIPSET(0x67C0, POLARIS10_, POLARIS10)
+CHIPSET(0x67DF, POLARIS10_, POLARIS10)
+
 CHIPSET(0x98E4, STONEY_, STONEY)