xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/ati_pciids_gen.h              |    2 ++
 src/pcidb/ati_pciids.csv          |    2 ++
 src/radeon_chipinfo_gen.h         |    2 ++
 src/radeon_chipset_gen.h          |    2 ++
 src/radeon_pci_chipset_gen.h      |    2 ++
 src/radeon_pci_device_match_gen.h |    2 ++
 6 files changed, 12 insertions(+)

New commits:
commit 0ded9fab6bc3fecc1976ae8369b788659e4d7793
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Apr 2 12:09:00 2009 -0400

    Add RV790 (HD 4890) support

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index f31cadb..3304e84 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -345,6 +345,8 @@
 #define PCI_CHIP_RV770_9456 0x9456
 #define PCI_CHIP_RV770_945A 0x945A
 #define PCI_CHIP_RV770_945B 0x945B
+#define PCI_CHIP_RV790_9460 0x9460
+#define PCI_CHIP_RV790_9462 0x9462
 #define PCI_CHIP_RV770_946A 0x946A
 #define PCI_CHIP_RV770_946B 0x946B
 #define PCI_CHIP_RV770_947A 0x947A
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index bff80ca..b361d9d 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -346,6 +346,8 @@
 "0x9456","RV770_9456","RV770",,,,,,"ATI FirePro V8700 (FireGL)"
 "0x945A","RV770_945A","RV770",1,,,,,"ATI Mobility RADEON HD 4870"
 "0x945B","RV770_945B","RV770",1,,,,,"ATI Mobility RADEON M98"
+"0x9460","RV790_9460","RV770",,,,,,"ATI Radeon 4800 Series"
+"0x9462","RV790_9462","RV770",,,,,,"ATI Radeon 4800 Series"
 "0x946A","RV770_946A","RV770",1,,,,,"ATI FirePro M7750"
 "0x946B","RV770_946B","RV770",1,,,,,"ATI M98"
 "0x947A","RV770_947A","RV770",1,,,,,"ATI M98"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index e36828c..6321246 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -265,6 +265,8 @@ RADEONCardInfo RADEONCards[] = {
  { 0x9456, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
  { 0x945A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
  { 0x945B, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
+ { 0x9460, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
+ { 0x9462, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 },
  { 0x946A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
  { 0x946B, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
  { 0x947A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index caa497a..631eda8 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -265,6 +265,8 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RV770_9456, "ATI FirePro V8700 (FireGL)" },
   { PCI_CHIP_RV770_945A, "ATI Mobility RADEON HD 4870" },
   { PCI_CHIP_RV770_945B, "ATI Mobility RADEON M98" },
+  { PCI_CHIP_RV790_9460, "ATI Radeon 4800 Series" },
+  { PCI_CHIP_RV790_9462, "ATI Radeon 4800 Series" },
   { PCI_CHIP_RV770_946A, "ATI FirePro M7750" },
   { PCI_CHIP_RV770_946B, "ATI M98" },
   { PCI_CHIP_RV770_947A, "ATI M98" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index b9368d7..d61c57d 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -265,6 +265,8 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RV770_9456, PCI_CHIP_RV770_9456, RES_SHARED_VGA },
  { PCI_CHIP_RV770_945A, PCI_CHIP_RV770_945A, RES_SHARED_VGA },
  { PCI_CHIP_RV770_945B, PCI_CHIP_RV770_945B, RES_SHARED_VGA },
+ { PCI_CHIP_RV790_9460, PCI_CHIP_RV790_9460, RES_SHARED_VGA },
+ { PCI_CHIP_RV790_9462, PCI_CHIP_RV790_9462, RES_SHARED_VGA },
  { PCI_CHIP_RV770_946A, PCI_CHIP_RV770_946A, RES_SHARED_VGA },
  { PCI_CHIP_RV770_946B, PCI_CHIP_RV770_946B, RES_SHARED_VGA },
  { PCI_CHIP_RV770_947A, PCI_CHIP_RV770_947A, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 3923371..a06b4a6 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -265,6 +265,8 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_9456, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_945A, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_945B, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RV790_9460, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RV790_9462, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_946A, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_946B, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV770_947A, 0 ),