diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
commit | 73105e438e90f950249cb265ba99001d4db3dc60 (patch) | |
tree | add0e49232de50548191a4243ed0d32cc91d1ec5 /src/atiadjust.c | |
parent | 0a53864f9581196604d04fd28b4e94a9b0b73d18 (diff) |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'src/atiadjust.c')
-rw-r--r-- | src/atiadjust.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/atiadjust.c b/src/atiadjust.c index df2ac64..3db016d 100644 --- a/src/atiadjust.c +++ b/src/atiadjust.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c,v 1.14 2003/01/01 19:16:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c,v 1.15 2003/04/23 21:51:27 tsi Exp $ */ /* * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -38,7 +38,7 @@ */ /* - * ATIAjustPreInit -- + * ATIAjustPreInit -- * * This function calculates values needed to speed up the setting of the * display start address. @@ -90,11 +90,17 @@ ATIAdjustPreInit pATI->AdjustMaxBase <<= 1; } else if (!pATI->CPIO_VGAWonder) + { pATI->AdjustMaxBase = 0xFFFFU << 3; + } else if (pATI->Chip <= ATI_CHIP_28800_6) + { pATI->AdjustMaxBase = 0x03FFFFU << 3; + } else /* Mach32 & Mach64 */ + { pATI->AdjustMaxBase = 0x0FFFFFU << 3; + } break; #endif /* AVOID_CPIO */ |