xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 422bdd4fe6cb728e1dd08a56f6ee2d0f009cbfcb
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Nov 14 09:39:16 2011 -0500

    radeon: add missing FireMV pci id
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index ff7c91b..1548569 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -85,6 +85,7 @@
 #define PCI_CHIP_RV250_Ld 0x4C64
 #define PCI_CHIP_RV250_Lf 0x4C66
 #define PCI_CHIP_RV250_Lg 0x4C67
+#define PCI_CHIP_RV280_4C6E 0x4C6E
 #define PCI_CHIP_RAGE128MF 0x4D46
 #define PCI_CHIP_RAGE128ML 0x4D4C
 #define PCI_CHIP_R300_ND 0x4E44
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 131e56c..e8a3578 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -86,6 +86,7 @@
 "0x4C64","RV250_Ld","RV250",1,,,,,"ATI FireGL Mobility 9000 (M9) Ld (AGP)"
 "0x4C66","RV250_Lf","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9) Lf (AGP)"
 "0x4C67","RV250_Lg","RV250",1,,,,,"ATI Radeon Mobility 9000 (M9) Lg (AGP)"
+"0x4C6E","RV280_4C6E","RV280",1,,,,,"ATI FireMV 2400 PCI"
 "0x4D46","RAGE128MF","R128",,,,,,
 "0x4D4C","RAGE128ML","R128",,,,,,
 "0x4E44","R300_ND","R300",,,,,,"ATI Radeon 9700 Pro ND (AGP)"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index fcf6b33..51a106b 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -53,6 +53,7 @@ static RADEONCardInfo RADEONCards[] = {
  { 0x4C64, CHIP_FAMILY_RV250, 1, 0, 0, 0, 0 },
  { 0x4C66, CHIP_FAMILY_RV250, 1, 0, 0, 0, 0 },
  { 0x4C67, CHIP_FAMILY_RV250, 1, 0, 0, 0, 0 },
+ { 0x4C6E, CHIP_FAMILY_RV280, 1, 0, 0, 0, 0 },
  { 0x4E44, CHIP_FAMILY_R300, 0, 0, 0, 0, 0 },
  { 0x4E45, CHIP_FAMILY_R300, 0, 0, 0, 0, 0 },
  { 0x4E46, CHIP_FAMILY_R300, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 0303a5d..5228f06 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -53,6 +53,7 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_RV250_Ld, "ATI FireGL Mobility 9000 (M9) Ld (AGP)" },
   { PCI_CHIP_RV250_Lf, "ATI Radeon Mobility 9000 (M9) Lf (AGP)" },
   { PCI_CHIP_RV250_Lg, "ATI Radeon Mobility 9000 (M9) Lg (AGP)" },
+  { PCI_CHIP_RV280_4C6E, "ATI FireMV 2400 PCI" },
   { PCI_CHIP_R300_ND, "ATI Radeon 9700 Pro ND (AGP)" },
   { PCI_CHIP_R300_NE, "ATI Radeon 9700/9500Pro NE (AGP)" },
   { PCI_CHIP_R300_NF, "ATI Radeon 9600TX NF (AGP)" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 549eaca..9af0c9c 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -53,6 +53,7 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_RV250_Ld, PCI_CHIP_RV250_Ld, RES_SHARED_VGA },
  { PCI_CHIP_RV250_Lf, PCI_CHIP_RV250_Lf, RES_SHARED_VGA },
  { PCI_CHIP_RV250_Lg, PCI_CHIP_RV250_Lg, RES_SHARED_VGA },
+ { PCI_CHIP_RV280_4C6E, PCI_CHIP_RV280_4C6E, RES_SHARED_VGA },
  { PCI_CHIP_R300_ND, PCI_CHIP_R300_ND, RES_SHARED_VGA },
  { PCI_CHIP_R300_NE, PCI_CHIP_R300_NE, RES_SHARED_VGA },
  { PCI_CHIP_R300_NF, PCI_CHIP_R300_NF, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 0739f81..0e018fa 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -53,6 +53,7 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_RV250_Ld, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV250_Lf, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_RV250_Lg, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_RV280_4C6E, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R300_ND, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R300_NE, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R300_NF, 0 ),