Always use the linear aperture.

- drop (pATI->OptionLinear == FALSE)

- AcceleratorVideoRAM is always set, i.e. VGAVideoRAM is not used

- pATI->LinearBase is always set

- xf86LinearVidMem() is now checked in atipreinit() for both CPIO and MMIO

1 files changed, 4 insertions, 34 deletions

diff --git a/src/atividmem.c b/src/atividmem.c
index e7c44ccd..89e164d3 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -103,18 +103,7 @@ ATIUnmapLinear
     ATIPtr pATI
 )
 {
-
-#ifdef AVOID_CPIO
-
-    if (!pATI->pMemory)
-        return;
-
-#else /* AVOID_CPIO */
-
-    if (pATI->pMemory != pATI->pBank)
-
-#endif /* AVOID_CPIO */
-
+    if (pATI->pMemory)
     {
         xf86UnMapVidMem(iScreen, pATI->pMemory, pATI->LinearSize);
 
@@ -178,33 +167,15 @@ ATIMapApertures
     ATIPtr pATI
 )
 {
-    pciVideoPtr   pVideo;
-    PCITAG        Tag;
-    unsigned long PageSize;
+    pciVideoPtr   pVideo = pATI->PCIInfo;
+    PCITAG        Tag = ((pciConfigPtr)(pVideo->thisCard))->tag;
+    unsigned long PageSize = getpagesize();
 
     if (pATI->Mapped)
         return TRUE;
 
 #ifndef AVOID_CPIO
 
-    if (!pATI->VGAAdapter)
-
-#endif /* AVOID_CPIO */
-
-    {
-        if (!pATI->LinearBase && !pATI->Block0Base)
-            return FALSE;
-    }
-
-    PageSize = getpagesize();
-
-    if ((pVideo = pATI->PCIInfo))
-        Tag = ((pciConfigPtr)(pVideo->thisCard))->tag;
-    else
-        Tag = 0;
-
-#ifndef AVOID_CPIO
-
     /* Map VGA aperture */
     if (pATI->VGAAdapter)
     {
@@ -222,7 +193,6 @@ ATIMapApertures
         if (!pATI->pBank)
             return FALSE;
 
-        pATI->pMemory =
             pATI->BankInfo.pBankA =
             pATI->BankInfo.pBankB = pATI->pBank;