diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-03-19 19:04:10 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-03-21 20:18:57 +0200 |
| commit | e7defc0e930f1b2d83623a769b2bfdb05c66a5fe (patch) | |
| tree | 25f5f3fadab143d3ac708ad7d4ed9394a7233b2e /src/atipreinit.c | |
| parent | 3dfdba195f1ff794ab00585ab80e7ea6ac92fcf4 (diff) | |
[mach64] Move setting of PIO and MMIO addresses up, after BIOS init.
Partially revert "Minor refactoring of pATI->Block0Base computation."
This parially reverts commit 2c8b33b761e4411451aea1eea3a89d629aeea40d.
Diffstat (limited to 'src/atipreinit.c')
| -rw-r--r-- | src/atipreinit.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/atipreinit.c b/src/atipreinit.c index 62fd660a..f63784f1 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -401,6 +401,20 @@ ATIPreInit return TRUE; } + /* I/O bases might no longer be valid after BIOS initialisation */ + { + if (pATI->CPIODecoding == BLOCK_IO) + pATI->CPIOBase = PCI_REGION_BASE(pVideo, 1, REGION_IO); + + pATI->MMIOInLinear = FALSE; + + /* Set MMIO address from PCI configuration space, if available */ + if ((pATI->Block0Base = PCI_REGION_BASE(pVideo, 2, REGION_MEM))) + { + pATI->Block0Base += 0x0400U; + } + } + #ifdef AVOID_CPIO pScreenInfo->racMemFlags = @@ -423,19 +437,6 @@ ATIPreInit /* Finish probing the adapter */ { - /* I/O bases might no longer be valid after BIOS initialisation */ - - /* Set CPIO address from PCI configuration space, for block I/O */ - if (pATI->CPIODecoding == BLOCK_IO) - pATI->CPIOBase = PCI_REGION_BASE(pVideo, 1, REGION_IO); - - pATI->MMIOInLinear = FALSE; - - /* Set MMIO address from PCI configuration space, if available */ - if ((pATI->Block0Base = PCI_REGION_BASE(pVideo, 2, REGION_MEM))) - { - pATI->Block0Base += 0x0400U; - } Block0Base = pATI->Block0Base; /* save */ |