diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 00:44:31 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-01-28 01:24:20 +0200 |
| commit | 383e963e275d351ea3631c352f5795340162d69f (patch) | |
| tree | 971755167deb2a7e430b282454ce51860f780711 /src/aticonfig.c | |
| parent | 9b126f45db27496c1ad16db65a61fe641a018983 (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/aticonfig.c')
| -rw-r--r-- | src/aticonfig.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/aticonfig.c b/src/aticonfig.c index 46f3d873..6c3e1a61 100644 --- a/src/aticonfig.c +++ b/src/aticonfig.c @@ -121,12 +121,6 @@ ATIProcessOptions # define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool # define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool -#ifndef AVOID_CPIO - -# define Linear PublicOption[ATI_OPTION_LINEAR].value.bool - -#endif /* AVOID_CPIO */ - #ifdef XF86DRI_DEVEL # define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool @@ -165,12 +159,6 @@ ATIProcessOptions { Accel = CacheMMIO = HWCursor = TRUE; -#ifndef AVOID_CPIO - - Linear = TRUE; - -#endif /* AVOID_CPIO */ - #ifdef TV_OUT TvStd = "None"; /* No tv standard change requested */ @@ -200,19 +188,6 @@ ATIProcessOptions xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, PrivateOption); -#ifndef AVOID_CPIO - - /* Disable linear apertures if the OS doesn't support them */ - if (!xf86LinearVidMem() && Linear) - { - if (PublicOption[ATI_OPTION_LINEAR].found) - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "OS does not support linear apertures.\n"); - Linear = FALSE; - } - -#endif /* AVOID_CPIO */ - /* Move option values into driver private structure */ pATI->OptionAccel = Accel; pATI->OptionBIOSDisplay = BIOSDisplay; @@ -221,12 +196,6 @@ ATIProcessOptions pATI->OptionCSync = CSync; pATI->OptionDevel = Devel; -#ifndef AVOID_CPIO - - pATI->OptionLinear = Linear; - -#endif /* AVOID_CPIO */ - #ifdef TV_OUT if (TvOut && pATI->Chip < ATI_CHIP_264GT) { |