diff options
| author | Luc Verhaegen <libv@skynet.be> | 2006-04-23 21:03:48 +0200 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2006-04-23 21:03:48 +0200 |
| commit | feb3fa4f94110f02200d2852afdfd66e1f8dabf7 (patch) | |
| tree | 3479db2a9077cde6661d44943f38f0db293034c4 | |
| parent | 540bc376237c09a42372ca90a4dcc79ba1d9e67f (diff) | |
Remove actual ATI_OPTION_LINEAR.
| -rw-r--r-- | src/aticonfig.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/aticonfig.c b/src/aticonfig.c index 00f9036..03227b7 100644 --- a/src/aticonfig.c +++ b/src/aticonfig.c @@ -68,12 +68,6 @@ typedef enum ATI_OPTION_CSYNC, ATI_OPTION_HWCURSOR, -#ifndef AVOID_CPIO - - ATI_OPTION_LINEAR, - -#endif /* AVOID_CPIO */ - #ifdef XF86DRI_DEVEL ATI_OPTION_IS_PCI, @@ -109,9 +103,6 @@ static const OptionInfoRec ATIPublicOptions[] = { ATI_OPTION_CRT_DISPLAY, "crt_display", OPTV_BOOLEAN, {0, }, FALSE }, { ATI_OPTION_CSYNC, "composite_sync", OPTV_BOOLEAN, {0, }, FALSE }, { ATI_OPTION_HWCURSOR, "hw_cursor", OPTV_BOOLEAN, {0, }, FALSE }, -#ifndef AVOID_CPIO - { ATI_OPTION_LINEAR, "linear", OPTV_BOOLEAN, {0, }, FALSE }, -#endif /* AVOID_CPIO */ #ifdef XF86DRI_DEVEL { ATI_OPTION_IS_PCI, "force_pci_mode", OPTV_BOOLEAN, {0, }, FALSE }, { ATI_OPTION_DMA_MODE, "dma_mode", OPTV_STRING, {0, }, FALSE }, @@ -199,12 +190,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 @@ -241,12 +226,6 @@ ATIProcessOptions /* Set non-zero defaults */ Accel = CacheMMIO = HWCursor = TRUE; -#ifndef AVOID_CPIO - - Linear = TRUE; - -#endif /* AVOID_CPIO */ - #ifdef TV_OUT TvStd = "None"; /* No tv standard change requested */ @@ -267,19 +246,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; |