xf86-video-amdgpu: Branch 'master' - 3 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Tue Aug 30 07:55:40 UTC 2016
src/amdgpu_chipinfo_gen.h | 17 +++++++++++++++++
src/amdgpu_chipset_gen.h | 38 ++++++++++++++++++++++++++++++++++++++
src/amdgpu_pci_chipset_gen.h | 17 +++++++++++++++++
src/amdgpu_pci_device_match_gen.h | 17 +++++++++++++++++
src/amdgpu_probe.c | 2 +-
src/amdgpu_probe.h | 1 +
src/ati_pciids_gen.h | 17 +++++++++++++++++
src/pcidb/ati_pciids.csv | 17 +++++++++++++++++
src/pcidb/parse_pci_ids.pl | 7 +++++++
9 files changed, 132 insertions(+), 1 deletion(-)
New commits:
commit 6a1ba044c2b71081e6060d0c096917d6238f2145
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Mon Aug 29 16:43:59 2016 +0900
Only list each unique chipset family once in the log file
Acked-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index 30e5d24..3bfab87 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -193,3 +193,24 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_POLARIS10_67CF, "POLARIS10" },
{ -1, NULL }
};
+
+SymTabRec AMDGPUUniqueChipsets[] = {
+ { 0, "BONAIRE" },
+ { 0, "CARRIZO" },
+ { 0, "FIJI" },
+ { 0, "HAINAN" },
+ { 0, "HAWAII" },
+ { 0, "KABINI" },
+ { 0, "KAVERI" },
+ { 0, "MULLINS" },
+ { 0, "OLAND" },
+ { 0, "PITCAIRN" },
+ { 0, "POLARIS10" },
+ { 0, "POLARIS11" },
+ { 0, "STONEY" },
+ { 0, "TAHITI" },
+ { 0, "TONGA" },
+ { 0, "TOPAZ" },
+ { 0, "VERDE" },
+ { -1, NULL }
+};
diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index 1c32742..213d245 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -77,7 +77,7 @@ static const OptionInfoRec *AMDGPUAvailableOptions(int chipid, int busid)
static void AMDGPUIdentify(int flags)
{
xf86PrintChipsets(AMDGPU_NAME,
- "Driver for AMD Radeon chipsets", AMDGPUChipsets);
+ "Driver for AMD Radeon chipsets", AMDGPUUniqueChipsets);
}
static char *amdgpu_bus_id(ScrnInfoPtr pScrn, struct pci_device *dev)
diff --git a/src/pcidb/parse_pci_ids.pl b/src/pcidb/parse_pci_ids.pl
index 06a9e1e..9b6c6f2 100755
--- a/src/pcidb/parse_pci_ids.pl
+++ b/src/pcidb/parse_pci_ids.pl
@@ -16,6 +16,8 @@ my $amdgpupcidevicematchfile = 'amdgpu_pci_device_match_gen.h';
my $amdgpuchipsetfile = 'amdgpu_chipset_gen.h';
my $amdgpuchipinfofile = 'amdgpu_chipinfo_gen.h';
+my %uniquechipsets;
+
my $csv = Text::CSV_XS->new();
open (CSV, "<", $file) or die $!;
@@ -48,6 +50,7 @@ while (<CSV>) {
print PCIDEVICEMATCH " ATI_DEVICE_MATCH( PCI_CHIP_$columns[1], 0 ),\n";
print AMDGPUCHIPSET " { PCI_CHIP_$columns[1], \"$columns[3]\" },\n";
+ $uniquechipsets{$columns[3]} = 1;
print AMDGPUCHIPINFO " { $columns[0], CHIP_FAMILY_$columns[2] },\n";
}
@@ -59,6 +62,10 @@ while (<CSV>) {
}
print AMDGPUCHIPINFO "};\n";
+print AMDGPUCHIPSET " { -1, NULL }\n};\n\nSymTabRec AMDGPUUniqueChipsets[] = {\n";
+foreach (sort keys %uniquechipsets) {
+ print AMDGPUCHIPSET " { 0, \"$_\" },\n";
+}
print AMDGPUCHIPSET " { -1, NULL }\n};\n";
print PCICHIPSET " { -1, -1, RES_UNDEFINED }\n};\n";
print PCIDEVICEMATCH " { 0, 0, 0 }\n};\n";
commit 7d050d15d49ef25e86e7abe88dafb52370715640
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Mon Aug 29 16:13:20 2016 +0900
Add missing Kaveri PCI ID (1318)
Found by comparing src/pcidb/ati_pciids.csv with xf86-video-ati.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index 5b7b220..90b13bb 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -134,6 +134,7 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x1315, CHIP_FAMILY_KAVERI },
{ 0x1316, CHIP_FAMILY_KAVERI },
{ 0x1317, CHIP_FAMILY_KAVERI },
+ { 0x1318, CHIP_FAMILY_KAVERI },
{ 0x131B, CHIP_FAMILY_KAVERI },
{ 0x131C, CHIP_FAMILY_KAVERI },
{ 0x131D, CHIP_FAMILY_KAVERI },
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index e0b75c4..30e5d24 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -134,6 +134,7 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_KAVERI_1315, "KAVERI" },
{ PCI_CHIP_KAVERI_1316, "KAVERI" },
{ PCI_CHIP_KAVERI_1317, "KAVERI" },
+ { PCI_CHIP_KAVERI_1318, "KAVERI" },
{ PCI_CHIP_KAVERI_131B, "KAVERI" },
{ PCI_CHIP_KAVERI_131C, "KAVERI" },
{ PCI_CHIP_KAVERI_131D, "KAVERI" },
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 2048e6b..3d54a02 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -134,6 +134,7 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ 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_1318, PCI_CHIP_KAVERI_1318, 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 },
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index ba254ca..721397c 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -134,6 +134,7 @@ static const struct pci_id_match amdgpu_device_match[] = {
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_1318, 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 ),
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index bfb836f..08fd12c 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -132,6 +132,7 @@
#define PCI_CHIP_KAVERI_1315 0x1315
#define PCI_CHIP_KAVERI_1316 0x1316
#define PCI_CHIP_KAVERI_1317 0x1317
+#define PCI_CHIP_KAVERI_1318 0x1318
#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 932d2f1..3c572bf 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -133,6 +133,7 @@
"0x1315","KAVERI_1315","KAVERI","KAVERI"
"0x1316","KAVERI_1316","KAVERI","KAVERI"
"0x1317","KAVERI_1317","KAVERI","KAVERI"
+"0x1318","KAVERI_1318","KAVERI","KAVERI"
"0x131B","KAVERI_131B","KAVERI","KAVERI"
"0x131C","KAVERI_131C","KAVERI","KAVERI"
"0x131D","KAVERI_131D","KAVERI","KAVERI"
commit aa5492660958e359bdc2107cba9a211ff988c90e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Mon Aug 29 15:52:48 2016 +0900
Add Mullins PCI IDs
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97472
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/amdgpu_chipinfo_gen.h b/src/amdgpu_chipinfo_gen.h
index 639c796..5b7b220 100644
--- a/src/amdgpu_chipinfo_gen.h
+++ b/src/amdgpu_chipinfo_gen.h
@@ -100,6 +100,22 @@ static AMDGPUCardInfo AMDGPUCards[] = {
{ 0x983D, CHIP_FAMILY_KABINI },
{ 0x983E, CHIP_FAMILY_KABINI },
{ 0x983F, CHIP_FAMILY_KABINI },
+ { 0x9850, CHIP_FAMILY_MULLINS },
+ { 0x9851, CHIP_FAMILY_MULLINS },
+ { 0x9852, CHIP_FAMILY_MULLINS },
+ { 0x9853, CHIP_FAMILY_MULLINS },
+ { 0x9854, CHIP_FAMILY_MULLINS },
+ { 0x9855, CHIP_FAMILY_MULLINS },
+ { 0x9856, CHIP_FAMILY_MULLINS },
+ { 0x9857, CHIP_FAMILY_MULLINS },
+ { 0x9858, CHIP_FAMILY_MULLINS },
+ { 0x9859, CHIP_FAMILY_MULLINS },
+ { 0x985A, CHIP_FAMILY_MULLINS },
+ { 0x985B, CHIP_FAMILY_MULLINS },
+ { 0x985C, CHIP_FAMILY_MULLINS },
+ { 0x985D, CHIP_FAMILY_MULLINS },
+ { 0x985E, CHIP_FAMILY_MULLINS },
+ { 0x985F, CHIP_FAMILY_MULLINS },
{ 0x1304, CHIP_FAMILY_KAVERI },
{ 0x1305, CHIP_FAMILY_KAVERI },
{ 0x1306, CHIP_FAMILY_KAVERI },
diff --git a/src/amdgpu_chipset_gen.h b/src/amdgpu_chipset_gen.h
index a9ab5a9..e0b75c4 100644
--- a/src/amdgpu_chipset_gen.h
+++ b/src/amdgpu_chipset_gen.h
@@ -100,6 +100,22 @@ SymTabRec AMDGPUChipsets[] = {
{ PCI_CHIP_KABINI_983D, "KABINI" },
{ PCI_CHIP_KABINI_983E, "KABINI" },
{ PCI_CHIP_KABINI_983F, "KABINI" },
+ { PCI_CHIP_MULLINS_9850, "MULLINS" },
+ { PCI_CHIP_MULLINS_9851, "MULLINS" },
+ { PCI_CHIP_MULLINS_9852, "MULLINS" },
+ { PCI_CHIP_MULLINS_9853, "MULLINS" },
+ { PCI_CHIP_MULLINS_9854, "MULLINS" },
+ { PCI_CHIP_MULLINS_9855, "MULLINS" },
+ { PCI_CHIP_MULLINS_9856, "MULLINS" },
+ { PCI_CHIP_MULLINS_9857, "MULLINS" },
+ { PCI_CHIP_MULLINS_9858, "MULLINS" },
+ { PCI_CHIP_MULLINS_9859, "MULLINS" },
+ { PCI_CHIP_MULLINS_985A, "MULLINS" },
+ { PCI_CHIP_MULLINS_985B, "MULLINS" },
+ { PCI_CHIP_MULLINS_985C, "MULLINS" },
+ { PCI_CHIP_MULLINS_985D, "MULLINS" },
+ { PCI_CHIP_MULLINS_985E, "MULLINS" },
+ { PCI_CHIP_MULLINS_985F, "MULLINS" },
{ PCI_CHIP_KAVERI_1304, "KAVERI" },
{ PCI_CHIP_KAVERI_1305, "KAVERI" },
{ PCI_CHIP_KAVERI_1306, "KAVERI" },
diff --git a/src/amdgpu_pci_chipset_gen.h b/src/amdgpu_pci_chipset_gen.h
index 45bb574..2048e6b 100644
--- a/src/amdgpu_pci_chipset_gen.h
+++ b/src/amdgpu_pci_chipset_gen.h
@@ -100,6 +100,22 @@ static PciChipsets AMDGPUPciChipsets[] = {
{ 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_MULLINS_9850, PCI_CHIP_MULLINS_9850, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9851, PCI_CHIP_MULLINS_9851, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9852, PCI_CHIP_MULLINS_9852, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9853, PCI_CHIP_MULLINS_9853, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9854, PCI_CHIP_MULLINS_9854, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9855, PCI_CHIP_MULLINS_9855, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9856, PCI_CHIP_MULLINS_9856, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9857, PCI_CHIP_MULLINS_9857, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9858, PCI_CHIP_MULLINS_9858, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_9859, PCI_CHIP_MULLINS_9859, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985A, PCI_CHIP_MULLINS_985A, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985B, PCI_CHIP_MULLINS_985B, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985C, PCI_CHIP_MULLINS_985C, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985D, PCI_CHIP_MULLINS_985D, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985E, PCI_CHIP_MULLINS_985E, RES_SHARED_VGA },
+ { PCI_CHIP_MULLINS_985F, PCI_CHIP_MULLINS_985F, 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 },
diff --git a/src/amdgpu_pci_device_match_gen.h b/src/amdgpu_pci_device_match_gen.h
index a7e4594..ba254ca 100644
--- a/src/amdgpu_pci_device_match_gen.h
+++ b/src/amdgpu_pci_device_match_gen.h
@@ -100,6 +100,22 @@ static const struct pci_id_match amdgpu_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_MULLINS_9850, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9851, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9852, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9853, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9854, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9855, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9856, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9857, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9858, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9859, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985A, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985E, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985F, 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 ),
diff --git a/src/amdgpu_probe.h b/src/amdgpu_probe.h
index 490ef3a..e6af3a2 100644
--- a/src/amdgpu_probe.h
+++ b/src/amdgpu_probe.h
@@ -67,6 +67,7 @@ typedef enum {
CHIP_FAMILY_KAVERI,
CHIP_FAMILY_KABINI,
CHIP_FAMILY_HAWAII,
+ CHIP_FAMILY_MULLINS,
CHIP_FAMILY_TOPAZ,
CHIP_FAMILY_TONGA,
CHIP_FAMILY_CARRIZO,
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index e15783e..bfb836f 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -98,6 +98,22 @@
#define PCI_CHIP_KABINI_983D 0x983D
#define PCI_CHIP_KABINI_983E 0x983E
#define PCI_CHIP_KABINI_983F 0x983F
+#define PCI_CHIP_MULLINS_9850 0x9850
+#define PCI_CHIP_MULLINS_9851 0x9851
+#define PCI_CHIP_MULLINS_9852 0x9852
+#define PCI_CHIP_MULLINS_9853 0x9853
+#define PCI_CHIP_MULLINS_9854 0x9854
+#define PCI_CHIP_MULLINS_9855 0x9855
+#define PCI_CHIP_MULLINS_9856 0x9856
+#define PCI_CHIP_MULLINS_9857 0x9857
+#define PCI_CHIP_MULLINS_9858 0x9858
+#define PCI_CHIP_MULLINS_9859 0x9859
+#define PCI_CHIP_MULLINS_985A 0x985A
+#define PCI_CHIP_MULLINS_985B 0x985B
+#define PCI_CHIP_MULLINS_985C 0x985C
+#define PCI_CHIP_MULLINS_985D 0x985D
+#define PCI_CHIP_MULLINS_985E 0x985E
+#define PCI_CHIP_MULLINS_985F 0x985F
#define PCI_CHIP_KAVERI_1304 0x1304
#define PCI_CHIP_KAVERI_1305 0x1305
#define PCI_CHIP_KAVERI_1306 0x1306
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 6fd23be..932d2f1 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -99,6 +99,22 @@
"0x983D","KABINI_983D","KABINI","KABINI"
"0x983E","KABINI_983E","KABINI","KABINI"
"0x983F","KABINI_983F","KABINI","KABINI"
+"0x9850","MULLINS_9850","MULLINS","MULLINS"
+"0x9851","MULLINS_9851","MULLINS","MULLINS"
+"0x9852","MULLINS_9852","MULLINS","MULLINS"
+"0x9853","MULLINS_9853","MULLINS","MULLINS"
+"0x9854","MULLINS_9854","MULLINS","MULLINS"
+"0x9855","MULLINS_9855","MULLINS","MULLINS"
+"0x9856","MULLINS_9856","MULLINS","MULLINS"
+"0x9857","MULLINS_9857","MULLINS","MULLINS"
+"0x9858","MULLINS_9858","MULLINS","MULLINS"
+"0x9859","MULLINS_9859","MULLINS","MULLINS"
+"0x985A","MULLINS_985A","MULLINS","MULLINS"
+"0x985B","MULLINS_985B","MULLINS","MULLINS"
+"0x985C","MULLINS_985C","MULLINS","MULLINS"
+"0x985D","MULLINS_985D","MULLINS","MULLINS"
+"0x985E","MULLINS_985E","MULLINS","MULLINS"
+"0x985F","MULLINS_985F","MULLINS","MULLINS"
"0x1304","KAVERI_1304","KAVERI","KAVERI"
"0x1305","KAVERI_1305","KAVERI","KAVERI"
"0x1306","KAVERI_1306","KAVERI","KAVERI"
More information about the xorg-commit
mailing list