DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge

1 files changed, 15 insertions, 28 deletions

diff --git a/src/atichip.c b/src/atichip.c
index 4d4861bc..f1fa25e7 100644
--- a/src/atichip.c
+++ b/src/atichip.c
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.38tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.35 2003/07/02 17:31:28 martin Exp $ */
 /*
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -101,8 +101,6 @@ const char *ATIChipNames[] =
     "ATI Radeon 9700/9500",
     "ATI Radeon 9600",
     "ATI Radeon 9800",
-    "ATI Radeon 9800XT",
-    "ATI unknown Radeon",
     "ATI Rage HDTV"
 };
 
@@ -675,11 +673,14 @@ ATIChipID
         case NewChipID('Q', 'X'):
             return ATI_CHIP_RV200;
 
+        case NewChipID('I', 'd'):
+        case NewChipID('I', 'e'):
         case NewChipID('I', 'f'):
         case NewChipID('I', 'g'):
             return ATI_CHIP_RV250;
 
         case NewChipID('L', 'd'):
+        case NewChipID('L', 'e'):
         case NewChipID('L', 'f'):
         case NewChipID('L', 'g'):
             return ATI_CHIP_RADEONMOBILITY9;
@@ -690,12 +691,14 @@ ATIChipID
 
         case NewChipID('Y', '\''):
         case NewChipID('Y', 'a'):
-        case NewChipID('Y', 'b'):
-        case NewChipID('Y', 'd'):
+        case NewChipID('I', 'b'):
+        case NewChipID('I', 'c'):
             return ATI_CHIP_RV280;
 
-        case NewChipID('\\', 'a'):
-        case NewChipID('\\', 'c'):
+        case NewChipID('Y', 'h'):
+        case NewChipID('Y', 'i'):
+        case NewChipID('Y', 'j'):
+        case NewChipID('Y', 'k'):
             return ATI_CHIP_RADEONMOBILITY9PLUS;
 
         case NewChipID('A', 'D'):
@@ -708,40 +711,24 @@ ATIChipID
         case NewChipID('N', 'G'):
             return ATI_CHIP_R300;
 
-        case NewChipID('A', 'H'):
-        case NewChipID('A', 'I'):
-        case NewChipID('A', 'J'):
         case NewChipID('A', 'K'):
         case NewChipID('N', 'H'):
-        case NewChipID('N', 'I'):
         case NewChipID('N', 'K'):
             return ATI_CHIP_R350;
 
+        case NewChipID('N', 'P'):
         case NewChipID('A', 'P'):
-        case NewChipID('A', 'Q'):
         case NewChipID('A', 'R'):
-        case NewChipID('A', 'S'):
-        case NewChipID('A', 'T'):
-        case NewChipID('A', 'V'):
-        case NewChipID('N', 'P'):
-        case NewChipID('N', 'Q'):
-        case NewChipID('N', 'R'):
-        case NewChipID('N', 'S'):
-        case NewChipID('N', 'T'):
-        case NewChipID('N', 'V'):
             return ATI_CHIP_RV350;
 
-        case NewChipID('N', 'J'):
-            return ATI_CHIP_R360;
-
         case NewChipID('H', 'D'):
             return ATI_CHIP_HDTV;
 
         default:
             /*
-             * Treat anything else as an unknown Radeon.  Please keep the above
-             * up-to-date however, as it serves as a central chip list.
+             * I'd say it's a Rage128 or a Radeon here, except that I don't
+             * support them.
              */
-            return ATI_CHIP_Radeon;
+            return ATI_CHIP_Mach64;
     }
 }