diff options
| author | tsi <tsi> | 2008-05-08 20:59:18 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-05-08 20:59:18 +0000 |
| commit | 50c177fe35ed64b16e2d241fe1e4db37cb49f272 (patch) | |
| tree | dec4e55c8cf0dc9575698d98e699d9583465572a | |
| parent | 7f223acce5e401df319aac289593c4ab6c278270 (diff) | |
48. Fix ATIPreInit() glitch that caused it to ignore the posiibility that the
common layer had relocated a Mach64's PCI block I/O base
(Marc La France).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 5 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index eb217eb96..840d1a24f 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,7 @@ XFree86 4.7.99.17 (xx May 2008) + 48. Fix ATIPreInit() glitch that caused it to ignore the posiibility that the + common layer had relocated a Mach64's PCI block I/O base + (Marc La France). 47. Disable Mach64 hardware cursors when the unaccelerated VGA CRTC is used to produce server-generated video modes (Marc La France). 46. Fix Mach64 video memory burst transfers on x86_64 (Marc La France). @@ -20741,4 +20744,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3956 2008/05/02 15:09:09 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3957 2008/05/08 15:47:11 tsi Exp $ diff --git a/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c b/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c index 51fafacef..0477b21bc 100644 --- a/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c +++ b/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.95tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.96tsi Exp $ */ /* * Copyright 1999 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * @@ -721,7 +721,11 @@ ATIPreInit if ((pVideo = pATI->PCIInfo)) { if (pVideo->ioBase[1]) + { pATI->CPIOBase = pVideo->ioBase[1] + pATI->DomainIOBase; + if (pATI->IODecoding == MEMORY_IO) + pATI->IODecoding = BLOCK_IO; + } /* Set MMIO address from PCI configuration space, if available */ if ((pATI->Block0Base = pVideo->memBase[2])) |