xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Tue May 3 12:15:26 PDT 2011
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 859e052af49e68a826b77a9135c7f067dc331a06
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue May 3 15:15:04 2011 -0400
radeon: add some new pci ids
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index ba46c17..9e1e086 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -471,6 +471,7 @@
#define PCI_CHIP_CYPRESS_688D 0x688D
#define PCI_CHIP_CYPRESS_6898 0x6898
#define PCI_CHIP_CYPRESS_6899 0x6899
+#define PCI_CHIP_CYPRESS_689B 0x689B
#define PCI_CHIP_CYPRESS_689E 0x689E
#define PCI_CHIP_HEMLOCK_689C 0x689C
#define PCI_CHIP_HEMLOCK_689D 0x689D
@@ -481,7 +482,9 @@
#define PCI_CHIP_JUNIPER_68B0 0x68B0
#define PCI_CHIP_JUNIPER_68B8 0x68B8
#define PCI_CHIP_JUNIPER_68B9 0x68B9
+#define PCI_CHIP_JUNIPER_68BA 0x68BA
#define PCI_CHIP_JUNIPER_68BE 0x68BE
+#define PCI_CHIP_JUNIPER_68BF 0x68BF
#define PCI_CHIP_REDWOOD_68C0 0x68C0
#define PCI_CHIP_REDWOOD_68C1 0x68C1
#define PCI_CHIP_REDWOOD_68C7 0x68C7
@@ -516,6 +519,7 @@
#define PCI_CHIP_CAYMAN_6719 0x6719
#define PCI_CHIP_CAYMAN_671C 0x671C
#define PCI_CHIP_CAYMAN_671D 0x671D
+#define PCI_CHIP_CAYMAN_671F 0x671F
#define PCI_CHIP_BARTS_6720 0x6720
#define PCI_CHIP_BARTS_6721 0x6721
#define PCI_CHIP_BARTS_6722 0x6722
@@ -528,6 +532,7 @@
#define PCI_CHIP_BARTS_6729 0x6729
#define PCI_CHIP_BARTS_6738 0x6738
#define PCI_CHIP_BARTS_6739 0x6739
+#define PCI_CHIP_BARTS_673E 0x673E
#define PCI_CHIP_TURKS_6740 0x6740
#define PCI_CHIP_TURKS_6741 0x6741
#define PCI_CHIP_TURKS_6742 0x6742
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index fd1fdbc..04c204f 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -472,6 +472,7 @@
"0x688D","CYPRESS_688D","CYPRESS",,,,,,"AMD Firestream 9350"
"0x6898","CYPRESS_6898","CYPRESS",,,,,,"ATI Radeon HD 5800 Series"
"0x6899","CYPRESS_6899","CYPRESS",,,,,,"ATI Radeon HD 5800 Series"
+"0x689B","CYPRESS_689B","CYPRESS",,,,,,"ATI Radeon HD 5800 Series"
"0x689E","CYPRESS_689E","CYPRESS",,,,,,"ATI Radeon HD 5800 Series"
"0x689C","HEMLOCK_689C","HEMLOCK",,,,,,"ATI Radeon HD 5900 Series"
"0x689D","HEMLOCK_689D","HEMLOCK",,,,,,"ATI Radeon HD 5900 Series"
@@ -482,7 +483,9 @@
"0x68B0","JUNIPER_68B0","JUNIPER",1,,,,,"ATI Mobility Radeon HD 5800 Series"
"0x68B8","JUNIPER_68B8","JUNIPER",,,,,,"ATI Radeon HD 5700 Series"
"0x68B9","JUNIPER_68B9","JUNIPER",,,,,,"ATI Radeon HD 5700 Series"
+"0x68BA","JUNIPER_68BA","JUNIPER",,,,,,"ATI Radeon HD 6700 Series"
"0x68BE","JUNIPER_68BE","JUNIPER",,,,,,"ATI Radeon HD 5700 Series"
+"0x68BF","JUNIPER_68BF","JUNIPER",,,,,,"ATI Radeon HD 6700 Series"
"0x68C0","REDWOOD_68C0","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5000 Series"
"0x68C1","REDWOOD_68C1","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5000 Series"
"0x68C7","REDWOOD_68C7","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5570"
@@ -517,6 +520,7 @@
"0x6719","CAYMAN_6719","CAYMAN",,,,,,"AMD Radeon HD 6900 Series"
"0x671C","CAYMAN_671C","CAYMAN",,,,,,"CAYMAN"
"0x671D","CAYMAN_671D","CAYMAN",,,,,,"CAYMAN"
+"0x671F","CAYMAN_671F","CAYMAN",,,,,,"CAYMAN"
"0x6720","BARTS_6720","BARTS",1,,,,,"AMD Radeon HD 6900M Series"
"0x6721","BARTS_6721","BARTS",1,,,,,"Mobility Radeon HD 6000 Series"
"0x6722","BARTS_6722","BARTS",,,,,,"BARTS"
@@ -529,6 +533,7 @@
"0x6729","BARTS_6729","BARTS",,,,,,"BARTS"
"0x6738","BARTS_6738","BARTS",,,,,,"AMD Radeon HD 6800 Series"
"0x6739","BARTS_6739","BARTS",,,,,,"AMD Radeon HD 6800 Series"
+"0x673E","BARTS_673E","BARTS",,,,,,"AMD Radeon HD 6700 Series"
"0x6740","TURKS_6740","TURKS",1,,,,,"TURKS"
"0x6741","TURKS_6741","TURKS",1,,,,,"TURKS"
"0x6742","TURKS_6742","TURKS",1,,,,,"TURKS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 630154b..23c1697 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -391,6 +391,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x688D, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x6898, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x6899, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
+ { 0x689B, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x689E, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x689C, CHIP_FAMILY_HEMLOCK, 0, 0, 0, 0, 0 },
{ 0x689D, CHIP_FAMILY_HEMLOCK, 0, 0, 0, 0, 0 },
@@ -401,7 +402,9 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x68B0, CHIP_FAMILY_JUNIPER, 1, 0, 0, 0, 0 },
{ 0x68B8, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 },
{ 0x68B9, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 },
+ { 0x68BA, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 },
{ 0x68BE, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 },
+ { 0x68BF, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 },
{ 0x68C0, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 },
{ 0x68C1, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 },
{ 0x68C7, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 },
@@ -436,6 +439,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6719, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
{ 0x671C, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
{ 0x671D, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x671F, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
{ 0x6720, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
{ 0x6721, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
{ 0x6722, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
@@ -448,6 +452,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6729, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
{ 0x6738, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
{ 0x6739, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
+ { 0x673E, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
{ 0x6740, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
{ 0x6741, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
{ 0x6742, CHIP_FAMILY_TURKS, 1, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 9996e0a..fb86211 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -391,6 +391,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_CYPRESS_688D, "AMD Firestream 9350" },
{ PCI_CHIP_CYPRESS_6898, "ATI Radeon HD 5800 Series" },
{ PCI_CHIP_CYPRESS_6899, "ATI Radeon HD 5800 Series" },
+ { PCI_CHIP_CYPRESS_689B, "ATI Radeon HD 5800 Series" },
{ PCI_CHIP_CYPRESS_689E, "ATI Radeon HD 5800 Series" },
{ PCI_CHIP_HEMLOCK_689C, "ATI Radeon HD 5900 Series" },
{ PCI_CHIP_HEMLOCK_689D, "ATI Radeon HD 5900 Series" },
@@ -401,7 +402,9 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_JUNIPER_68B0, "ATI Mobility Radeon HD 5800 Series" },
{ PCI_CHIP_JUNIPER_68B8, "ATI Radeon HD 5700 Series" },
{ PCI_CHIP_JUNIPER_68B9, "ATI Radeon HD 5700 Series" },
+ { PCI_CHIP_JUNIPER_68BA, "ATI Radeon HD 6700 Series" },
{ PCI_CHIP_JUNIPER_68BE, "ATI Radeon HD 5700 Series" },
+ { PCI_CHIP_JUNIPER_68BF, "ATI Radeon HD 6700 Series" },
{ PCI_CHIP_REDWOOD_68C0, "ATI Mobility Radeon HD 5000 Series" },
{ PCI_CHIP_REDWOOD_68C1, "ATI Mobility Radeon HD 5000 Series" },
{ PCI_CHIP_REDWOOD_68C7, "ATI Mobility Radeon HD 5570" },
@@ -436,6 +439,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_CAYMAN_6719, "AMD Radeon HD 6900 Series" },
{ PCI_CHIP_CAYMAN_671C, "CAYMAN" },
{ PCI_CHIP_CAYMAN_671D, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_671F, "CAYMAN" },
{ PCI_CHIP_BARTS_6720, "AMD Radeon HD 6900M Series" },
{ PCI_CHIP_BARTS_6721, "Mobility Radeon HD 6000 Series" },
{ PCI_CHIP_BARTS_6722, "BARTS" },
@@ -448,6 +452,7 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_BARTS_6729, "BARTS" },
{ PCI_CHIP_BARTS_6738, "AMD Radeon HD 6800 Series" },
{ PCI_CHIP_BARTS_6739, "AMD Radeon HD 6800 Series" },
+ { PCI_CHIP_BARTS_673E, "AMD Radeon HD 6700 Series" },
{ PCI_CHIP_TURKS_6740, "TURKS" },
{ PCI_CHIP_TURKS_6741, "TURKS" },
{ PCI_CHIP_TURKS_6742, "TURKS" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 67fec23..64af176 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -391,6 +391,7 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_CYPRESS_688D, PCI_CHIP_CYPRESS_688D, RES_SHARED_VGA },
{ PCI_CHIP_CYPRESS_6898, PCI_CHIP_CYPRESS_6898, RES_SHARED_VGA },
{ PCI_CHIP_CYPRESS_6899, PCI_CHIP_CYPRESS_6899, RES_SHARED_VGA },
+ { PCI_CHIP_CYPRESS_689B, PCI_CHIP_CYPRESS_689B, RES_SHARED_VGA },
{ PCI_CHIP_CYPRESS_689E, PCI_CHIP_CYPRESS_689E, RES_SHARED_VGA },
{ PCI_CHIP_HEMLOCK_689C, PCI_CHIP_HEMLOCK_689C, RES_SHARED_VGA },
{ PCI_CHIP_HEMLOCK_689D, PCI_CHIP_HEMLOCK_689D, RES_SHARED_VGA },
@@ -401,7 +402,9 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_JUNIPER_68B0, PCI_CHIP_JUNIPER_68B0, RES_SHARED_VGA },
{ PCI_CHIP_JUNIPER_68B8, PCI_CHIP_JUNIPER_68B8, RES_SHARED_VGA },
{ PCI_CHIP_JUNIPER_68B9, PCI_CHIP_JUNIPER_68B9, RES_SHARED_VGA },
+ { PCI_CHIP_JUNIPER_68BA, PCI_CHIP_JUNIPER_68BA, RES_SHARED_VGA },
{ PCI_CHIP_JUNIPER_68BE, PCI_CHIP_JUNIPER_68BE, RES_SHARED_VGA },
+ { PCI_CHIP_JUNIPER_68BF, PCI_CHIP_JUNIPER_68BF, RES_SHARED_VGA },
{ PCI_CHIP_REDWOOD_68C0, PCI_CHIP_REDWOOD_68C0, RES_SHARED_VGA },
{ PCI_CHIP_REDWOOD_68C1, PCI_CHIP_REDWOOD_68C1, RES_SHARED_VGA },
{ PCI_CHIP_REDWOOD_68C7, PCI_CHIP_REDWOOD_68C7, RES_SHARED_VGA },
@@ -436,6 +439,7 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_CAYMAN_6719, PCI_CHIP_CAYMAN_6719, RES_SHARED_VGA },
{ PCI_CHIP_CAYMAN_671C, PCI_CHIP_CAYMAN_671C, RES_SHARED_VGA },
{ PCI_CHIP_CAYMAN_671D, PCI_CHIP_CAYMAN_671D, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_671F, PCI_CHIP_CAYMAN_671F, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6720, PCI_CHIP_BARTS_6720, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6721, PCI_CHIP_BARTS_6721, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6722, PCI_CHIP_BARTS_6722, RES_SHARED_VGA },
@@ -448,6 +452,7 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_BARTS_6729, PCI_CHIP_BARTS_6729, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6738, PCI_CHIP_BARTS_6738, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6739, PCI_CHIP_BARTS_6739, RES_SHARED_VGA },
+ { PCI_CHIP_BARTS_673E, PCI_CHIP_BARTS_673E, RES_SHARED_VGA },
{ PCI_CHIP_TURKS_6740, PCI_CHIP_TURKS_6740, RES_SHARED_VGA },
{ PCI_CHIP_TURKS_6741, PCI_CHIP_TURKS_6741, RES_SHARED_VGA },
{ PCI_CHIP_TURKS_6742, PCI_CHIP_TURKS_6742, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 60b975c..e09daae 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -391,6 +391,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_688D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_6898, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_6899, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_689B, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_689E, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_HEMLOCK_689C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_HEMLOCK_689D, 0 ),
@@ -401,7 +402,9 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68B0, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68B8, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68B9, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68BA, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68BE, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68BF, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C0, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C1, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C7, 0 ),
@@ -436,6 +439,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6719, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671C, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671D, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671F, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6720, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6721, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6722, 0 ),
@@ -448,6 +452,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6729, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6738, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6739, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_BARTS_673E, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6740, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6741, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_TURKS_6742, 0 ),
More information about the xorg-commit
mailing list