xf86-video-ati: Branch '6.12-branch'

[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 74cb2aba79049b792c22abf25ade3693b802b260
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon May 18 10:48:25 2009 -0400

    r4xx: Add some missing pci ids
    
    Noticed by Romain in bug 21798

diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index c0e58e1..8b37d5b 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -60,6 +60,8 @@
 #define PCI_CHIP_R420_JN 0x4A4E
 #define PCI_CHIP_R420_4A4F 0x4A4F
 #define PCI_CHIP_R420_JP 0x4A50
+#define PCI_CHIP_R420_JT 0x4A54
+#define PCI_CHIP_R481_4B48 0x4B48
 #define PCI_CHIP_R481_4B49 0x4B49
 #define PCI_CHIP_R481_4B4A 0x4B4A
 #define PCI_CHIP_R481_4B4B 0x4B4B
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 32102fb..51dafee 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -61,6 +61,8 @@
 "0x4A4E","R420_JN","R420",1,,,,,"ATI Radeon Mobility 9800 (M18) JN (AGP)"
 "0x4A4F","R420_4A4F","R420",,,,,,"ATI Radeon X800 SE (R420) (AGP)"
 "0x4A50","R420_JP","R420",,,,,,"ATI Radeon X800XT (R420) JP (AGP)"
+"0x4A54","R420_JT","R420",,,,,,"ATI Radeon X800 VE (R420) JT (AGP)"
+"0x4B48","R481_4B48","R420",,,,,,"ATI Radeon X850 (R480) (AGP)"
 "0x4B49","R481_4B49","R420",,,,,,"ATI Radeon X850 XT (R480) (AGP)"
 "0x4B4A","R481_4B4A","R420",,,,,,"ATI Radeon X850 SE (R480) (AGP)"
 "0x4B4B","R481_4B4B","R420",,,,,,"ATI Radeon X850 PRO (R480) (AGP)"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index 516c73a..7b2512a 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -40,6 +40,8 @@ RADEONCardInfo RADEONCards[] = {
  { 0x4A4E, CHIP_FAMILY_R420, 1, 0, 0, 0, 0 },
  { 0x4A4F, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
  { 0x4A50, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
+ { 0x4A54, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
+ { 0x4B48, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
  { 0x4B49, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
  { 0x4B4A, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
  { 0x4B4B, CHIP_FAMILY_R420, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index ad0aede..70b9ff6 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -40,6 +40,8 @@ static SymTabRec RADEONChipsets[] = {
   { PCI_CHIP_R420_JN, "ATI Radeon Mobility 9800 (M18) JN (AGP)" },
   { PCI_CHIP_R420_4A4F, "ATI Radeon X800 SE (R420) (AGP)" },
   { PCI_CHIP_R420_JP, "ATI Radeon X800XT (R420) JP (AGP)" },
+  { PCI_CHIP_R420_JT, "ATI Radeon X800 VE (R420) JT (AGP)" },
+  { PCI_CHIP_R481_4B48, "ATI Radeon X850 (R480) (AGP)" },
   { PCI_CHIP_R481_4B49, "ATI Radeon X850 XT (R480) (AGP)" },
   { PCI_CHIP_R481_4B4A, "ATI Radeon X850 SE (R480) (AGP)" },
   { PCI_CHIP_R481_4B4B, "ATI Radeon X850 PRO (R480) (AGP)" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index 85143a7..7765ee6 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -40,6 +40,8 @@ PciChipsets RADEONPciChipsets[] = {
  { PCI_CHIP_R420_JN, PCI_CHIP_R420_JN, RES_SHARED_VGA },
  { PCI_CHIP_R420_4A4F, PCI_CHIP_R420_4A4F, RES_SHARED_VGA },
  { PCI_CHIP_R420_JP, PCI_CHIP_R420_JP, RES_SHARED_VGA },
+ { PCI_CHIP_R420_JT, PCI_CHIP_R420_JT, RES_SHARED_VGA },
+ { PCI_CHIP_R481_4B48, PCI_CHIP_R481_4B48, RES_SHARED_VGA },
  { PCI_CHIP_R481_4B49, PCI_CHIP_R481_4B49, RES_SHARED_VGA },
  { PCI_CHIP_R481_4B4A, PCI_CHIP_R481_4B4A, RES_SHARED_VGA },
  { PCI_CHIP_R481_4B4B, PCI_CHIP_R481_4B4B, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h
index 25c683a..397cf63 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -40,6 +40,8 @@ static const struct pci_id_match radeon_device_match[] = {
  ATI_DEVICE_MATCH( PCI_CHIP_R420_JN, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R420_4A4F, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R420_JP, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_R420_JT, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_R481_4B48, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R481_4B49, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R481_4B4A, 0 ),
  ATI_DEVICE_MATCH( PCI_CHIP_R481_4B4B, 0 ),