summaryrefslogtreecommitdiff
path: root/src/atixv.c
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2007-01-28 00:44:31 +0200
committerGeorge Sapountzis <gsap7@yahoo.gr>2007-01-28 01:24:20 +0200
commit383e963e275d351ea3631c352f5795340162d69f (patch)
tree971755167deb2a7e430b282454ce51860f780711 /src/atixv.c
parent9b126f45db27496c1ad16db65a61fe641a018983 (diff)
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
Diffstat (limited to 'src/atixv.c')
-rw-r--r--src/atixv.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/atixv.c b/src/atixv.c
index a3c0480..ef86ec3 100644
--- a/src/atixv.c
+++ b/src/atixv.c
@@ -92,15 +92,6 @@ ATIXVPreInit
ATIPtr pATI
)
{
-
-#ifndef AVOID_CPIO
-
- /* Currently a linear aperture is needed ... */
- if (!pATI->LinearBase)
- return;
-
-#endif /* AVOID_CPIO */
-
(void)xf86XVRegisterGenericAdaptorDriver(ATIXVInitializeAdaptor);
}
@@ -121,9 +112,7 @@ ATIInitializeXVideo
int nAdaptor;
Bool result;
- if (!(pScreenInfo->memPhysBase = pATI->LinearBase))
- return FALSE;
-
+ pScreenInfo->memPhysBase = pATI->LinearBase;
pScreenInfo->fbOffset = 0;
nAdaptor = xf86XVListGenericAdaptors(pScreenInfo, &ppAdaptor);