xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Sep 6 15:10:22 PDT 2013
src/ati_pciids_gen.h | 21 +++++++++++++++++++++
src/pcidb/ati_pciids.csv | 21 +++++++++++++++++++++
src/radeon_chipinfo_gen.h | 21 +++++++++++++++++++++
src/radeon_chipset_gen.h | 21 +++++++++++++++++++++
src/radeon_pci_chipset_gen.h | 21 +++++++++++++++++++++
src/radeon_pci_device_match_gen.h | 21 +++++++++++++++++++++
6 files changed, 126 insertions(+)
New commits:
commit fdb7563a5cbc736b09c2864b67a93b475c98b2bd
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Jan 24 21:17:11 2013 -0500
radeon/kms: add berlin pci ids
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index b7970e1..17222c1 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -722,3 +722,24 @@
#define PCI_CHIP_KABINI_983D 0x983D
#define PCI_CHIP_KABINI_983E 0x983E
#define PCI_CHIP_KABINI_983F 0x983F
+#define PCI_CHIP_KAVERI_1304 0x1304
+#define PCI_CHIP_KAVERI_1305 0x1305
+#define PCI_CHIP_KAVERI_1306 0x1306
+#define PCI_CHIP_KAVERI_1307 0x1307
+#define PCI_CHIP_KAVERI_1309 0x1309
+#define PCI_CHIP_KAVERI_130A 0x130A
+#define PCI_CHIP_KAVERI_130B 0x130B
+#define PCI_CHIP_KAVERI_130C 0x130C
+#define PCI_CHIP_KAVERI_130D 0x130D
+#define PCI_CHIP_KAVERI_130E 0x130E
+#define PCI_CHIP_KAVERI_130F 0x130F
+#define PCI_CHIP_KAVERI_1310 0x1310
+#define PCI_CHIP_KAVERI_1311 0x1311
+#define PCI_CHIP_KAVERI_1312 0x1312
+#define PCI_CHIP_KAVERI_1313 0x1313
+#define PCI_CHIP_KAVERI_1315 0x1315
+#define PCI_CHIP_KAVERI_1316 0x1316
+#define PCI_CHIP_KAVERI_1317 0x1317
+#define PCI_CHIP_KAVERI_131B 0x131B
+#define PCI_CHIP_KAVERI_131C 0x131C
+#define PCI_CHIP_KAVERI_131D 0x131D
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 221b83c..abde9d4 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -723,3 +723,24 @@
"0x983D","KABINI_983D","KABINI",,1,,,1,"KABINI"
"0x983E","KABINI_983E","KABINI",,1,,,1,"KABINI"
"0x983F","KABINI_983F","KABINI",,1,,,1,"KABINI"
+"0x1304","KAVERI_1304","KAVERI",1,1,,,1,"KAVERI"
+"0x1305","KAVERI_1305","KAVERI",,1,,,1,"KAVERI"
+"0x1306","KAVERI_1306","KAVERI",1,1,,,1,"KAVERI"
+"0x1307","KAVERI_1307","KAVERI",,1,,,1,"KAVERI"
+"0x1309","KAVERI_1309","KAVERI",1,1,,,1,"KAVERI"
+"0x130A","KAVERI_130A","KAVERI",1,1,,,1,"KAVERI"
+"0x130B","KAVERI_130B","KAVERI",1,1,,,1,"KAVERI"
+"0x130C","KAVERI_130C","KAVERI",1,1,,,1,"KAVERI"
+"0x130D","KAVERI_130D","KAVERI",1,1,,,1,"KAVERI"
+"0x130E","KAVERI_130E","KAVERI",1,1,,,1,"KAVERI"
+"0x130F","KAVERI_130F","KAVERI",,1,,,1,"KAVERI"
+"0x1310","KAVERI_1310","KAVERI",,1,,,1,"KAVERI"
+"0x1311","KAVERI_1311","KAVERI",,1,,,1,"KAVERI"
+"0x1312","KAVERI_1312","KAVERI",,1,,,1,"KAVERI"
+"0x1313","KAVERI_1313","KAVERI",,1,,,1,"KAVERI"
+"0x1315","KAVERI_1315","KAVERI",,1,,,1,"KAVERI"
+"0x1316","KAVERI_1316","KAVERI",,1,,,1,"KAVERI"
+"0x1317","KAVERI_1317","KAVERI",1,1,,,1,"KAVERI"
+"0x131B","KAVERI_131B","KAVERI",,1,,,1,"KAVERI"
+"0x131C","KAVERI_131C","KAVERI",,1,,,1,"KAVERI"
+"0x131D","KAVERI_131D","KAVERI",,1,,,1,"KAVERI"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 221d93e..bd4d85f 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -642,4 +642,25 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x983D, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
{ 0x983E, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
{ 0x983F, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 },
+ { 0x1304, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1305, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1306, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x1307, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1309, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130A, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130B, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130C, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130D, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130E, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x130F, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1310, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1311, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1312, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1313, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1315, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1316, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x1317, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 },
+ { 0x131B, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x131C, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
+ { 0x131D, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 },
};
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 02ae852..40f2d9c 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -642,5 +642,26 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_KABINI_983D, "KABINI" },
{ PCI_CHIP_KABINI_983E, "KABINI" },
{ PCI_CHIP_KABINI_983F, "KABINI" },
+ { PCI_CHIP_KAVERI_1304, "KAVERI" },
+ { PCI_CHIP_KAVERI_1305, "KAVERI" },
+ { PCI_CHIP_KAVERI_1306, "KAVERI" },
+ { PCI_CHIP_KAVERI_1307, "KAVERI" },
+ { PCI_CHIP_KAVERI_1309, "KAVERI" },
+ { PCI_CHIP_KAVERI_130A, "KAVERI" },
+ { PCI_CHIP_KAVERI_130B, "KAVERI" },
+ { PCI_CHIP_KAVERI_130C, "KAVERI" },
+ { PCI_CHIP_KAVERI_130D, "KAVERI" },
+ { PCI_CHIP_KAVERI_130E, "KAVERI" },
+ { PCI_CHIP_KAVERI_130F, "KAVERI" },
+ { PCI_CHIP_KAVERI_1310, "KAVERI" },
+ { PCI_CHIP_KAVERI_1311, "KAVERI" },
+ { PCI_CHIP_KAVERI_1312, "KAVERI" },
+ { PCI_CHIP_KAVERI_1313, "KAVERI" },
+ { PCI_CHIP_KAVERI_1315, "KAVERI" },
+ { PCI_CHIP_KAVERI_1316, "KAVERI" },
+ { PCI_CHIP_KAVERI_1317, "KAVERI" },
+ { PCI_CHIP_KAVERI_131B, "KAVERI" },
+ { PCI_CHIP_KAVERI_131C, "KAVERI" },
+ { PCI_CHIP_KAVERI_131D, "KAVERI" },
{ -1, NULL }
};
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index ff6227f..e8b5f13 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -642,5 +642,26 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_KABINI_983D, PCI_CHIP_KABINI_983D, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_983E, PCI_CHIP_KABINI_983E, RES_SHARED_VGA },
{ PCI_CHIP_KABINI_983F, PCI_CHIP_KABINI_983F, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1304, PCI_CHIP_KAVERI_1304, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1305, PCI_CHIP_KAVERI_1305, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1306, PCI_CHIP_KAVERI_1306, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1307, PCI_CHIP_KAVERI_1307, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1309, PCI_CHIP_KAVERI_1309, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130A, PCI_CHIP_KAVERI_130A, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130B, PCI_CHIP_KAVERI_130B, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130C, PCI_CHIP_KAVERI_130C, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130D, PCI_CHIP_KAVERI_130D, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130E, PCI_CHIP_KAVERI_130E, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_130F, PCI_CHIP_KAVERI_130F, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1310, PCI_CHIP_KAVERI_1310, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1311, PCI_CHIP_KAVERI_1311, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1312, PCI_CHIP_KAVERI_1312, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1313, PCI_CHIP_KAVERI_1313, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1315, PCI_CHIP_KAVERI_1315, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1316, PCI_CHIP_KAVERI_1316, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_1317, PCI_CHIP_KAVERI_1317, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_131B, PCI_CHIP_KAVERI_131B, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_131C, PCI_CHIP_KAVERI_131C, RES_SHARED_VGA },
+ { PCI_CHIP_KAVERI_131D, PCI_CHIP_KAVERI_131D, RES_SHARED_VGA },
{ -1, -1, RES_UNDEFINED }
};
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 88603e6..4b0de84 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -642,5 +642,26 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983E, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1304, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1305, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1306, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1307, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1309, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130A, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130E, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_130F, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1310, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1311, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1312, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1313, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1315, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1316, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1317, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_131D, 0 ),
{ 0, 0, 0 }
};
More information about the xorg-commit
mailing list