summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c39
1 files changed, 37 insertions, 2 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
index 407e3ab8f..c27ca1f47 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
@@ -1,6 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.27 2002/10/12 01:38:06 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c,v 1.33 2003/02/19 15:07:46 tsi Exp $ */
/*
- * Copyright 1997 through 2002 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
@@ -537,19 +537,34 @@ ATIChipID
case NewChipID('R', 'E'):
case NewChipID('R', 'F'):
+ case NewChipID('R', 'G'):
case NewChipID('S', 'K'):
case NewChipID('S', 'L'):
case NewChipID('S', 'M'):
+ /* "SN" is listed as ATI_CHIP_RAGE128_4X in ATI docs */
case NewChipID('S', 'N'):
return ATI_CHIP_RAGE128GL;
case NewChipID('R', 'K'):
case NewChipID('R', 'L'):
+ /*
+ * ATI documentation lists SE/SF/SG under both ATI_CHIP_RAGE128VR
+ * and ATI_CHIP_RAGE128_4X, and lists SH/SK/SL under Rage 128 4X only.
+ * I'm stuffing them here for now until this can be clarified as ATI
+ * documentation doesn't mention their details. <mharris@redhat.com>
+ */
case NewChipID('S', 'E'):
case NewChipID('S', 'F'):
case NewChipID('S', 'G'):
+ case NewChipID('S', 'H'):
return ATI_CHIP_RAGE128VR;
+ /* case NewChipID('S', 'H'): */
+ /* case NewChipID('S', 'K'): */
+ /* case NewChipID('S', 'L'): */
+ /* case NewChipID('S', 'N'): */
+ /* return ATI_CHIP_RAGE128_4X; */
+
case NewChipID('P', 'A'):
case NewChipID('P', 'B'):
case NewChipID('P', 'C'):
@@ -581,10 +596,17 @@ ATIChipID
case NewChipID('T', 'F'):
case NewChipID('T', 'L'):
case NewChipID('T', 'R'):
+ case NewChipID('T', 'S'):
+ case NewChipID('T', 'T'):
+ case NewChipID('T', 'U'):
return ATI_CHIP_RAGE128PROULTRA;
case NewChipID('L', 'E'):
case NewChipID('L', 'F'):
+ /*
+ * "LK" and "LL" are not in any ATI documentation I can find
+ * - mharris
+ */
case NewChipID('L', 'K'):
case NewChipID('L', 'L'):
return ATI_CHIP_RAGE128MOBILITY3;
@@ -611,9 +633,18 @@ ATIChipID
case NewChipID('L', 'X'):
return ATI_CHIP_RADEONMOBILITY7;
+ case NewChipID('Q', 'H'):
+ case NewChipID('Q', 'I'):
+ case NewChipID('Q', 'J'):
+ case NewChipID('Q', 'K'):
case NewChipID('Q', 'L'):
+ case NewChipID('Q', 'M'):
case NewChipID('Q', 'N'):
case NewChipID('Q', 'O'):
+ case NewChipID('Q', 'h'):
+ case NewChipID('Q', 'i'):
+ case NewChipID('Q', 'j'):
+ case NewChipID('Q', 'k'):
case NewChipID('Q', 'l'):
case NewChipID('B', 'B'):
return ATI_CHIP_R200;
@@ -634,6 +665,10 @@ ATIChipID
case NewChipID('L', 'g'):
return ATI_CHIP_RADEONMOBILITY9;
+ case NewChipID('A', 'D'):
+ case NewChipID('A', 'E'):
+ case NewChipID('A', 'F'):
+ case NewChipID('A', 'G'):
case NewChipID('N', 'D'):
case NewChipID('N', 'E'):
case NewChipID('N', 'F'):