xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Aug 21 08:30:37 PDT 2014
src/ati_pciids_gen.h | 9 ++++++++-
src/pcidb/ati_pciids.csv | 7 +++++++
src/radeon_chipinfo_gen.h | 9 ++++++++-
src/radeon_chipset_gen.h | 7 +++++++
src/radeon_pci_chipset_gen.h | 7 +++++++
src/radeon_pci_device_match_gen.h | 7 +++++++
6 files changed, 44 insertions(+), 2 deletions(-)
New commits:
commit efef34930650d6d80f7b527f4cee76d9e5954ace
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Aug 21 11:30:17 2014 -0400
radeon/kms: add new SI 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 c552678..e59cd59 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -668,6 +668,7 @@
#define PCI_CHIP_VERDE_6829 0x6829
#define PCI_CHIP_VERDE_682A 0x682A
#define PCI_CHIP_VERDE_682B 0x682B
+#define PCI_CHIP_VERDE_682C 0x682C
#define PCI_CHIP_VERDE_682D 0x682D
#define PCI_CHIP_VERDE_682F 0x682F
#define PCI_CHIP_VERDE_6830 0x6830
@@ -683,8 +684,11 @@
#define PCI_CHIP_OLAND_6601 0x6601
#define PCI_CHIP_OLAND_6602 0x6602
#define PCI_CHIP_OLAND_6603 0x6603
+#define PCI_CHIP_OLAND_6604 0x6604
+#define PCI_CHIP_OLAND_6605 0x6605
#define PCI_CHIP_OLAND_6606 0x6606
#define PCI_CHIP_OLAND_6607 0x6607
+#define PCI_CHIP_OLAND_6608 0x6608
#define PCI_CHIP_OLAND_6610 0x6610
#define PCI_CHIP_OLAND_6611 0x6611
#define PCI_CHIP_OLAND_6613 0x6613
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e9db795..a3168a3 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -669,6 +669,7 @@
"0x6829","VERDE_6829","VERDE",,,,,,"VERDE"
"0x682A","VERDE_682A","VERDE",1,,,,,"VERDE"
"0x682B","VERDE_682B","VERDE",1,,,,,"VERDE"
+"0x682C","VERDE_682C","VERDE",,,,,,"VERDE"
"0x682D","VERDE_682D","VERDE",1,,,,,"VERDE"
"0x682F","VERDE_682F","VERDE",1,,,,,"VERDE"
"0x6830","VERDE_6830","VERDE",1,,,,,"VERDE"
@@ -684,8 +685,11 @@
"0x6601","OLAND_6601","OLAND",1,,,,,"OLAND"
"0x6602","OLAND_6602","OLAND",1,,,,,"OLAND"
"0x6603","OLAND_6603","OLAND",1,,,,,"OLAND"
+"0x6604","OLAND_6604","OLAND",1,,,,,"OLAND"
+"0x6605","OLAND_6605","OLAND",1,,,,,"OLAND"
"0x6606","OLAND_6606","OLAND",1,,,,,"OLAND"
"0x6607","OLAND_6607","OLAND",1,,,,,"OLAND"
+"0x6608","OLAND_6608","OLAND",,,,,,"OLAND"
"0x6610","OLAND_6610","OLAND",,,,,,"OLAND"
"0x6611","OLAND_6611","OLAND",,,,,,"OLAND"
"0x6613","OLAND_6613","OLAND",,,,,,"OLAND"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index c853d41..dc9866f 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -588,6 +588,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6829, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x682A, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x682B, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
+ { 0x682C, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x682D, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x682F, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6830, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
@@ -603,8 +604,11 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6601, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6602, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6603, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6604, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6605, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6606, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
{ 0x6607, CHIP_FAMILY_OLAND, 1, 0, 0, 0, 0 },
+ { 0x6608, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6610, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6611, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
{ 0x6613, CHIP_FAMILY_OLAND, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 3b5edd4..e3f23b6 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -588,6 +588,7 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_VERDE_6829, "VERDE" },
{ PCI_CHIP_VERDE_682A, "VERDE" },
{ PCI_CHIP_VERDE_682B, "VERDE" },
+ { PCI_CHIP_VERDE_682C, "VERDE" },
{ PCI_CHIP_VERDE_682D, "VERDE" },
{ PCI_CHIP_VERDE_682F, "VERDE" },
{ PCI_CHIP_VERDE_6830, "VERDE" },
@@ -603,8 +604,11 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_OLAND_6601, "OLAND" },
{ PCI_CHIP_OLAND_6602, "OLAND" },
{ PCI_CHIP_OLAND_6603, "OLAND" },
+ { PCI_CHIP_OLAND_6604, "OLAND" },
+ { PCI_CHIP_OLAND_6605, "OLAND" },
{ PCI_CHIP_OLAND_6606, "OLAND" },
{ PCI_CHIP_OLAND_6607, "OLAND" },
+ { PCI_CHIP_OLAND_6608, "OLAND" },
{ PCI_CHIP_OLAND_6610, "OLAND" },
{ PCI_CHIP_OLAND_6611, "OLAND" },
{ PCI_CHIP_OLAND_6613, "OLAND" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index a7d8613..bd68920 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -588,6 +588,7 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_VERDE_6829, PCI_CHIP_VERDE_6829, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682A, PCI_CHIP_VERDE_682A, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682B, PCI_CHIP_VERDE_682B, RES_SHARED_VGA },
+ { PCI_CHIP_VERDE_682C, PCI_CHIP_VERDE_682C, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682D, PCI_CHIP_VERDE_682D, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_682F, PCI_CHIP_VERDE_682F, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6830, PCI_CHIP_VERDE_6830, RES_SHARED_VGA },
@@ -603,8 +604,11 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_OLAND_6601, PCI_CHIP_OLAND_6601, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6602, PCI_CHIP_OLAND_6602, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6603, PCI_CHIP_OLAND_6603, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6604, PCI_CHIP_OLAND_6604, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6605, PCI_CHIP_OLAND_6605, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6606, PCI_CHIP_OLAND_6606, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6607, PCI_CHIP_OLAND_6607, RES_SHARED_VGA },
+ { PCI_CHIP_OLAND_6608, PCI_CHIP_OLAND_6608, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6610, PCI_CHIP_OLAND_6610, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6611, PCI_CHIP_OLAND_6611, RES_SHARED_VGA },
{ PCI_CHIP_OLAND_6613, PCI_CHIP_OLAND_6613, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index a4ccb62..eaf280a 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -588,6 +588,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6829, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682A, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6830, 0 ),
@@ -603,8 +604,11 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6601, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6602, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6603, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6604, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6605, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6606, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6607, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6608, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6610, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6611, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_OLAND_6613, 0 ),
commit 39fef269f521c92a2a31c80447e9401bacb3797a
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Aug 21 11:27:49 2014 -0400
radeon/kms: add new CIK 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 94c8fc8..c552678 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -700,6 +700,8 @@
#define PCI_CHIP_HAINAN_666F 0x666F
#define PCI_CHIP_BONAIRE_6640 0x6640
#define PCI_CHIP_BONAIRE_6641 0x6641
+#define PCI_CHIP_BONAIRE_6646 0x6646
+#define PCI_CHIP_BONAIRE_6647 0x6647
#define PCI_CHIP_BONAIRE_6649 0x6649
#define PCI_CHIP_BONAIRE_6650 0x6650
#define PCI_CHIP_BONAIRE_6651 0x6651
@@ -727,7 +729,7 @@
#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_9855 0x9845
#define PCI_CHIP_MULLINS_9856 0x9856
#define PCI_CHIP_MULLINS_9857 0x9857
#define PCI_CHIP_MULLINS_9858 0x9858
@@ -756,6 +758,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 e334230..e9db795 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -701,6 +701,8 @@
"0x666F","HAINAN_666F","HAINAN",1,,,,,"HAINAN"
"0x6640","BONAIRE_6640","BONAIRE",1,,,,,"BONAIRE"
"0x6641","BONAIRE_6641","BONAIRE",1,,,,,"BONAIRE"
+"0x6646","BONAIRE_6646","BONAIRE",1,,,,,"BONAIRE"
+"0x6647","BONAIRE_6647","BONAIRE",1,,,,,"BONAIRE"
"0x6649","BONAIRE_6649","BONAIRE",,,,,,"BONAIRE"
"0x6650","BONAIRE_6650","BONAIRE",,,,,,"BONAIRE"
"0x6651","BONAIRE_6651","BONAIRE",,,,,,"BONAIRE"
@@ -757,6 +759,7 @@
"0x1315","KAVERI_1315","KAVERI",,1,,,1,"KAVERI"
"0x1316","KAVERI_1316","KAVERI",,1,,,1,"KAVERI"
"0x1317","KAVERI_1317","KAVERI",1,1,,,1,"KAVERI"
+"0x1318","KAVERI_1318","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 4f6e3bc..c853d41 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -620,6 +620,8 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x666F, CHIP_FAMILY_HAINAN, 1, 0, 0, 0, 0 },
{ 0x6640, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
{ 0x6641, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6646, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
+ { 0x6647, CHIP_FAMILY_BONAIRE, 1, 0, 0, 0, 0 },
{ 0x6649, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
{ 0x6650, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
{ 0x6651, CHIP_FAMILY_BONAIRE, 0, 0, 0, 0, 0 },
@@ -647,7 +649,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
- { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
+ { 0x9845, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
{ 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 },
@@ -676,6 +678,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 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 },
+ { 0x1318, 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 03a413e..3b5edd4 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -620,6 +620,8 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_HAINAN_666F, "HAINAN" },
{ PCI_CHIP_BONAIRE_6640, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6641, "BONAIRE" },
+ { PCI_CHIP_BONAIRE_6646, "BONAIRE" },
+ { PCI_CHIP_BONAIRE_6647, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6649, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6650, "BONAIRE" },
{ PCI_CHIP_BONAIRE_6651, "BONAIRE" },
@@ -676,6 +678,7 @@ SymTabRec RADEONChipsets[] = {
{ 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/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index a9b186c..a7d8613 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -620,6 +620,8 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_HAINAN_666F, PCI_CHIP_HAINAN_666F, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6640, PCI_CHIP_BONAIRE_6640, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6641, PCI_CHIP_BONAIRE_6641, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_6646, PCI_CHIP_BONAIRE_6646, RES_SHARED_VGA },
+ { PCI_CHIP_BONAIRE_6647, PCI_CHIP_BONAIRE_6647, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6649, PCI_CHIP_BONAIRE_6649, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6650, PCI_CHIP_BONAIRE_6650, RES_SHARED_VGA },
{ PCI_CHIP_BONAIRE_6651, PCI_CHIP_BONAIRE_6651, RES_SHARED_VGA },
@@ -676,6 +678,7 @@ static PciChipsets RADEONPciChipsets[] = {
{ 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/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index a73d9c1..a4ccb62 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -620,6 +620,8 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_HAINAN_666F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6640, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6641, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6646, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6647, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6649, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6650, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BONAIRE_6651, 0 ),
@@ -676,6 +678,7 @@ static const struct pci_id_match radeon_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 ),
More information about the xorg-commit
mailing list