xf86-video-ati: Branch 'master' - 2 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Thu Apr 25 11:20:02 PDT 2013
src/ati_pciids_gen.h | 5 +++++
src/pcidb/ati_pciids.csv | 5 +++++
src/radeon_chipinfo_gen.h | 5 +++++
src/radeon_chipset_gen.h | 5 +++++
src/radeon_pci_chipset_gen.h | 5 +++++
src/radeon_pci_device_match_gen.h | 5 +++++
6 files changed, 30 insertions(+)
New commits:
commit 6216b5aa3793abe71b864170bc9d4d745f027328
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Apr 25 14:19:37 2013 -0400
radeon: add new richland 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 3cd9068..cbc4b13 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -625,6 +625,8 @@
#define PCI_CHIP_ARUBA_9999 0x9999
#define PCI_CHIP_ARUBA_999A 0x999A
#define PCI_CHIP_ARUBA_999B 0x999B
+#define PCI_CHIP_ARUBA_999C 0x999C
+#define PCI_CHIP_ARUBA_999D 0x999D
#define PCI_CHIP_ARUBA_99A0 0x99A0
#define PCI_CHIP_ARUBA_99A2 0x99A2
#define PCI_CHIP_ARUBA_99A4 0x99A4
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index f48f1ee..2e0dc84 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -626,6 +626,8 @@
"0x9999","ARUBA_9999","ARUBA",1,1,,,,"ARUBA"
"0x999A","ARUBA_999A","ARUBA",1,1,,,,"ARUBA"
"0x999B","ARUBA_999B","ARUBA",1,1,,,,"ARUBA"
+"0x999C","ARUBA_999C","ARUBA",,1,,,,"ARUBA"
+"0x999D","ARUBA_999D","ARUBA",,1,,,,"ARUBA"
"0x99A0","ARUBA_99A0","ARUBA",1,1,,,,"ARUBA"
"0x99A2","ARUBA_99A2","ARUBA",1,1,,,,"ARUBA"
"0x99A4","ARUBA_99A4","ARUBA",,1,,,,"ARUBA"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 3734c52..4bcd139 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -545,6 +545,8 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x9999, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
{ 0x999A, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
{ 0x999B, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
+ { 0x999C, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
+ { 0x999D, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
{ 0x99A0, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
{ 0x99A2, CHIP_FAMILY_ARUBA, 1, 1, 0, 0, 0 },
{ 0x99A4, CHIP_FAMILY_ARUBA, 0, 1, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index ec039fc..bebdd88 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -545,6 +545,8 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_ARUBA_9999, "ARUBA" },
{ PCI_CHIP_ARUBA_999A, "ARUBA" },
{ PCI_CHIP_ARUBA_999B, "ARUBA" },
+ { PCI_CHIP_ARUBA_999C, "ARUBA" },
+ { PCI_CHIP_ARUBA_999D, "ARUBA" },
{ PCI_CHIP_ARUBA_99A0, "ARUBA" },
{ PCI_CHIP_ARUBA_99A2, "ARUBA" },
{ PCI_CHIP_ARUBA_99A4, "ARUBA" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 84a5d3c..ed37782 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -545,6 +545,8 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_ARUBA_9999, PCI_CHIP_ARUBA_9999, RES_SHARED_VGA },
{ PCI_CHIP_ARUBA_999A, PCI_CHIP_ARUBA_999A, RES_SHARED_VGA },
{ PCI_CHIP_ARUBA_999B, PCI_CHIP_ARUBA_999B, RES_SHARED_VGA },
+ { PCI_CHIP_ARUBA_999C, PCI_CHIP_ARUBA_999C, RES_SHARED_VGA },
+ { PCI_CHIP_ARUBA_999D, PCI_CHIP_ARUBA_999D, RES_SHARED_VGA },
{ PCI_CHIP_ARUBA_99A0, PCI_CHIP_ARUBA_99A0, RES_SHARED_VGA },
{ PCI_CHIP_ARUBA_99A2, PCI_CHIP_ARUBA_99A2, RES_SHARED_VGA },
{ PCI_CHIP_ARUBA_99A4, PCI_CHIP_ARUBA_99A4, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index cea8698..46a8428 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -545,6 +545,8 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_9999, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_999A, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_999B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_999C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_999D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_99A0, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_99A2, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_ARUBA_99A4, 0 ),
commit fd5903f15b36555bf1ccc1c3865c9fffd499128a
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Thu Apr 25 14:17:51 2013 -0400
radeon: 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 75978a5..3cd9068 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -656,6 +656,7 @@
#define PCI_CHIP_PITCAIRN_684C 0x684C
#define PCI_CHIP_VERDE_6820 0x6820
#define PCI_CHIP_VERDE_6821 0x6821
+#define PCI_CHIP_VERDE_6822 0x6822
#define PCI_CHIP_VERDE_6823 0x6823
#define PCI_CHIP_VERDE_6824 0x6824
#define PCI_CHIP_VERDE_6825 0x6825
@@ -663,11 +664,13 @@
#define PCI_CHIP_VERDE_6827 0x6827
#define PCI_CHIP_VERDE_6828 0x6828
#define PCI_CHIP_VERDE_6829 0x6829
+#define PCI_CHIP_VERDE_682A 0x682A
#define PCI_CHIP_VERDE_682B 0x682B
#define PCI_CHIP_VERDE_682D 0x682D
#define PCI_CHIP_VERDE_682F 0x682F
#define PCI_CHIP_VERDE_6830 0x6830
#define PCI_CHIP_VERDE_6831 0x6831
+#define PCI_CHIP_VERDE_6835 0x6835
#define PCI_CHIP_VERDE_6837 0x6837
#define PCI_CHIP_VERDE_6838 0x6838
#define PCI_CHIP_VERDE_6839 0x6839
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 53cea76..f48f1ee 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -657,6 +657,7 @@
"0x684C","PITCAIRN_684C","PITCAIRN",,,,,,"PITCAIRN"
"0x6820","VERDE_6820","VERDE",1,,,,,"VERDE"
"0x6821","VERDE_6821","VERDE",1,,,,,"VERDE"
+"0x6822","VERDE_6822","VERDE",1,,,,,"VERDE"
"0x6823","VERDE_6823","VERDE",1,,,,,"VERDE"
"0x6824","VERDE_6824","VERDE",1,,,,,"VERDE"
"0x6825","VERDE_6825","VERDE",1,,,,,"VERDE"
@@ -664,11 +665,13 @@
"0x6827","VERDE_6827","VERDE",1,,,,,"VERDE"
"0x6828","VERDE_6828","VERDE",,,,,,"VERDE"
"0x6829","VERDE_6829","VERDE",,,,,,"VERDE"
+"0x682A","VERDE_682A","VERDE",1,,,,,"VERDE"
"0x682B","VERDE_682B","VERDE",1,,,,,"VERDE"
"0x682D","VERDE_682D","VERDE",1,,,,,"VERDE"
"0x682F","VERDE_682F","VERDE",1,,,,,"VERDE"
"0x6830","VERDE_6830","VERDE",1,,,,,"VERDE"
"0x6831","VERDE_6831","VERDE",1,,,,,"VERDE"
+"0x6835","VERDE_6835","VERDE",,,,,,"VERDE"
"0x6837","VERDE_6837","VERDE",,,,,,"VERDE"
"0x6838","VERDE_6838","VERDE",,,,,,"VERDE"
"0x6839","VERDE_6839","VERDE",,,,,,"VERDE"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index fa973fb..3734c52 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -576,6 +576,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x684C, CHIP_FAMILY_PITCAIRN, 0, 0, 0, 0, 0 },
{ 0x6820, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6821, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
+ { 0x6822, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6823, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6824, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6825, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
@@ -583,11 +584,13 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6827, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
{ 0x6828, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 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 },
{ 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 },
{ 0x6831, CHIP_FAMILY_VERDE, 1, 0, 0, 0, 0 },
+ { 0x6835, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x6837, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x6838, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
{ 0x6839, CHIP_FAMILY_VERDE, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 62440f3..ec039fc 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -576,6 +576,7 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_PITCAIRN_684C, "PITCAIRN" },
{ PCI_CHIP_VERDE_6820, "VERDE" },
{ PCI_CHIP_VERDE_6821, "VERDE" },
+ { PCI_CHIP_VERDE_6822, "VERDE" },
{ PCI_CHIP_VERDE_6823, "VERDE" },
{ PCI_CHIP_VERDE_6824, "VERDE" },
{ PCI_CHIP_VERDE_6825, "VERDE" },
@@ -583,11 +584,13 @@ SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_VERDE_6827, "VERDE" },
{ PCI_CHIP_VERDE_6828, "VERDE" },
{ PCI_CHIP_VERDE_6829, "VERDE" },
+ { PCI_CHIP_VERDE_682A, "VERDE" },
{ PCI_CHIP_VERDE_682B, "VERDE" },
{ PCI_CHIP_VERDE_682D, "VERDE" },
{ PCI_CHIP_VERDE_682F, "VERDE" },
{ PCI_CHIP_VERDE_6830, "VERDE" },
{ PCI_CHIP_VERDE_6831, "VERDE" },
+ { PCI_CHIP_VERDE_6835, "VERDE" },
{ PCI_CHIP_VERDE_6837, "VERDE" },
{ PCI_CHIP_VERDE_6838, "VERDE" },
{ PCI_CHIP_VERDE_6839, "VERDE" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index c7e32df..84a5d3c 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -576,6 +576,7 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_PITCAIRN_684C, PCI_CHIP_PITCAIRN_684C, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6820, PCI_CHIP_VERDE_6820, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6821, PCI_CHIP_VERDE_6821, RES_SHARED_VGA },
+ { PCI_CHIP_VERDE_6822, PCI_CHIP_VERDE_6822, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6823, PCI_CHIP_VERDE_6823, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6824, PCI_CHIP_VERDE_6824, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6825, PCI_CHIP_VERDE_6825, RES_SHARED_VGA },
@@ -583,11 +584,13 @@ static PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_VERDE_6827, PCI_CHIP_VERDE_6827, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6828, PCI_CHIP_VERDE_6828, RES_SHARED_VGA },
{ 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_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 },
{ PCI_CHIP_VERDE_6831, PCI_CHIP_VERDE_6831, RES_SHARED_VGA },
+ { PCI_CHIP_VERDE_6835, PCI_CHIP_VERDE_6835, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6837, PCI_CHIP_VERDE_6837, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6838, PCI_CHIP_VERDE_6838, RES_SHARED_VGA },
{ PCI_CHIP_VERDE_6839, PCI_CHIP_VERDE_6839, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index ce2eea1..cea8698 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -576,6 +576,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_PITCAIRN_684C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6820, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6821, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6822, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6823, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6824, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6825, 0 ),
@@ -583,11 +584,13 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6827, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6828, 0 ),
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_682D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_682F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6830, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6831, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6835, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6837, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6838, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_VERDE_6839, 0 ),
More information about the xorg-commit
mailing list