xf86-video-ati: Branch 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Wed Aug 4 09:08:00 PDT 2010
src/ati_pciids_gen.h | 3 +++
src/pcidb/ati_pciids.csv | 7 +++++--
src/radeon_chipinfo_gen.h | 3 +++
src/radeon_chipset_gen.h | 7 +++++--
src/radeon_pci_chipset_gen.h | 3 +++
src/radeon_pci_device_match_gen.h | 3 +++
6 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit a3c59c6f6be7067421e348142da0ca13428dcd57
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Aug 4 12:07:36 2010 -0400
radeon: add new pci ids
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index b4479ac..4784d88 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -462,6 +462,8 @@
#define PCI_CHIP_CYPRESS_6888 0x6888
#define PCI_CHIP_CYPRESS_6889 0x6889
#define PCI_CHIP_CYPRESS_688A 0x688A
+#define PCI_CHIP_CYPRESS_688C 0x688C
+#define PCI_CHIP_CYPRESS_688D 0x688D
#define PCI_CHIP_CYPRESS_6898 0x6898
#define PCI_CHIP_CYPRESS_6899 0x6899
#define PCI_CHIP_CYPRESS_689E 0x689E
@@ -491,6 +493,7 @@
#define PCI_CHIP_CEDAR_68E8 0x68E8
#define PCI_CHIP_CEDAR_68E9 0x68E9
#define PCI_CHIP_CEDAR_68F1 0x68F1
+#define PCI_CHIP_CEDAR_68F2 0x68F2
#define PCI_CHIP_CEDAR_68F8 0x68F8
#define PCI_CHIP_CEDAR_68F9 0x68F9
#define PCI_CHIP_CEDAR_68FE 0x68FE
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 6f101b2..05028fe 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -463,6 +463,8 @@
"0x6888","CYPRESS_6888","CYPRESS",,,,,,"ATI FirePro (FireGL) Graphics Adapter"
"0x6889","CYPRESS_6889","CYPRESS",,,,,,"ATI FirePro (FireGL) Graphics Adapter"
"0x688A","CYPRESS_688A","CYPRESS",,,,,,"ATI FirePro (FireGL) Graphics Adapter"
+"0x688C","CYPRESS_688C","CYPRESS",,,,,,"AMD Firestream 9370"
+"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"
"0x689E","CYPRESS_689E","CYPRESS",,,,,,"ATI Radeon HD 5800 Series"
@@ -487,11 +489,12 @@
"0x68DE","REDWOOD_68DE","REDWOOD",,,,,,"REDWOOD"
"0x68E0","CEDAR_68E0","CEDAR",1,,,,,"ATI Mobility Radeon HD 5000 Series"
"0x68E1","CEDAR_68E1","CEDAR",1,,,,,"ATI Mobility Radeon HD 5000 Series"
-"0x68E4","CEDAR_68E4","CEDAR",1,,,,,"CEDAR"
-"0x68E5","CEDAR_68E5","CEDAR",1,,,,,"CEDAR"
+"0x68E4","CEDAR_68E4","CEDAR",1,,,,,"ATI Mobility Radeon Graphics"
+"0x68E5","CEDAR_68E5","CEDAR",1,,,,,"ATI Mobility Radeon Graphics"
"0x68E8","CEDAR_68E8","CEDAR",,,,,,"CEDAR"
"0x68E9","CEDAR_68E9","CEDAR",,,,,,"ATI FirePro (FireGL) Graphics Adapter"
"0x68F1","CEDAR_68F1","CEDAR",,,,,,"ATI FirePro (FireGL) Graphics Adapter"
+"0x68F2","CEDAR_68F2","CEDAR",,,,,,"ATI FirePro 2270"
"0x68F8","CEDAR_68F8","CEDAR",,,,,,"CEDAR"
"0x68F9","CEDAR_68F9","CEDAR",,,,,,"ATI Radeon HD 5450"
"0x68FE","CEDAR_68FE","CEDAR",,,,,,"CEDAR"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 3fc2a53..239c017 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -382,6 +382,8 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x6888, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x6889, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
{ 0x688A, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
+ { 0x688C, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
+ { 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 },
{ 0x689E, CHIP_FAMILY_CYPRESS, 0, 0, 0, 0, 0 },
@@ -411,6 +413,7 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x68E8, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68E9, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68F1, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
+ { 0x68F2, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68F8, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68F9, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68FE, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index e38579b..1ea8b36 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -382,6 +382,8 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_CYPRESS_6888, "ATI FirePro (FireGL) Graphics Adapter" },
{ PCI_CHIP_CYPRESS_6889, "ATI FirePro (FireGL) Graphics Adapter" },
{ PCI_CHIP_CYPRESS_688A, "ATI FirePro (FireGL) Graphics Adapter" },
+ { PCI_CHIP_CYPRESS_688C, "AMD Firestream 9370" },
+ { 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_689E, "ATI Radeon HD 5800 Series" },
@@ -406,11 +408,12 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_REDWOOD_68DE, "REDWOOD" },
{ PCI_CHIP_CEDAR_68E0, "ATI Mobility Radeon HD 5000 Series" },
{ PCI_CHIP_CEDAR_68E1, "ATI Mobility Radeon HD 5000 Series" },
- { PCI_CHIP_CEDAR_68E4, "CEDAR" },
- { PCI_CHIP_CEDAR_68E5, "CEDAR" },
+ { PCI_CHIP_CEDAR_68E4, "ATI Mobility Radeon Graphics" },
+ { PCI_CHIP_CEDAR_68E5, "ATI Mobility Radeon Graphics" },
{ PCI_CHIP_CEDAR_68E8, "CEDAR" },
{ PCI_CHIP_CEDAR_68E9, "ATI FirePro (FireGL) Graphics Adapter" },
{ PCI_CHIP_CEDAR_68F1, "ATI FirePro (FireGL) Graphics Adapter" },
+ { PCI_CHIP_CEDAR_68F2, "ATI FirePro 2270" },
{ PCI_CHIP_CEDAR_68F8, "CEDAR" },
{ PCI_CHIP_CEDAR_68F9, "ATI Radeon HD 5450" },
{ PCI_CHIP_CEDAR_68FE, "CEDAR" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index c1ead9c..fe9919d 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -382,6 +382,8 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_CYPRESS_6888, PCI_CHIP_CYPRESS_6888, RES_SHARED_VGA },
{ PCI_CHIP_CYPRESS_6889, PCI_CHIP_CYPRESS_6889, RES_SHARED_VGA },
{ PCI_CHIP_CYPRESS_688A, PCI_CHIP_CYPRESS_688A, RES_SHARED_VGA },
+ { PCI_CHIP_CYPRESS_688C, PCI_CHIP_CYPRESS_688C, RES_SHARED_VGA },
+ { 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_689E, PCI_CHIP_CYPRESS_689E, RES_SHARED_VGA },
@@ -411,6 +413,7 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_CEDAR_68E8, PCI_CHIP_CEDAR_68E8, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68E9, PCI_CHIP_CEDAR_68E9, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68F1, PCI_CHIP_CEDAR_68F1, RES_SHARED_VGA },
+ { PCI_CHIP_CEDAR_68F2, PCI_CHIP_CEDAR_68F2, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68F8, PCI_CHIP_CEDAR_68F8, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68F9, PCI_CHIP_CEDAR_68F9, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68FE, PCI_CHIP_CEDAR_68FE, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 709d8cc..14e516f 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -382,6 +382,8 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_6888, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_6889, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_688A, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CYPRESS_688C, 0 ),
+ 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_689E, 0 ),
@@ -411,6 +413,7 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68E8, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68E9, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F1, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F2, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F8, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F9, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68FE, 0 ),
More information about the xorg-commit
mailing list