diff options
-rw-r--r-- | man/siliconmotion.man | 20 | ||||
-rw-r--r-- | src/smi.h | 6 | ||||
-rw-r--r-- | src/smi_driver.c | 28 |
3 files changed, 0 insertions, 54 deletions
diff --git a/man/siliconmotion.man b/man/siliconmotion.man index 8d23e7f..9211ff8 100644 --- a/man/siliconmotion.man +++ b/man/siliconmotion.man @@ -163,26 +163,6 @@ stable. EXA is a newer acceleration architecture with better performance for the Render and Composite extensions, but the rendering code for it is newer and possibly unstable. The default is .B XAA. -.TP -.B "Option \*qfifo_aggressive\*q" -.TP -.B "Option \*qfifo_moderate\*q" -.TP -.B "Option \*qfifo_conservative\*q" -alter the settings -for the threshold at which the pixel FIFO takes over the internal -memory bus to refill itself. The smaller this threshold, the better -the acceleration performance of the card. You may try the fastest -setting -.RB ( "fifo_aggressive" ) -and move down if you encounter pixel corruption. -The optimal setting will probably depend on dot-clock and on color -depth. Note that specifying any of these options will also alter other -memory settings which may increase performance, so trying -.B "fifo_conservative" -will in most cases be a slight benefit (this uses the chip defaults). -If pixel corruption or transient streaking is observed during drawing -operations then removing any fifo options is recommended. Default: none. .PP The following PCI bus @@ -138,12 +138,6 @@ typedef struct Bool PCIBurst; /* Enable PCI burst mode for reads? */ Bool PCIRetry; /* Enable PCI retries */ - Bool fifo_conservative; /* Adjust fifo for - acceleration? */ - Bool fifo_moderate; /* Adjust fifo for - acceleration? */ - Bool fifo_aggressive; /* Adjust fifo for - acceleration? */ Bool HwCursor; /* hardware cursor enabled */ CARD8 DACmask; diff --git a/src/smi_driver.c b/src/smi_driver.c index a96321a..f9a3258 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -147,9 +147,6 @@ static PciChipsets SMIPciChipsets[] = typedef enum { OPTION_PCI_BURST, - OPTION_FIFO_CONSERV, - OPTION_FIFO_MODERATE, - OPTION_FIFO_AGGRESSIVE, OPTION_PCI_RETRY, OPTION_NOACCEL, OPTION_MCLK, @@ -172,9 +169,6 @@ typedef enum static const OptionInfoRec SMIOptions[] = { { OPTION_PCI_BURST, "pci_burst", OPTV_BOOLEAN, {0}, TRUE }, - { OPTION_FIFO_CONSERV, "fifo_conservative", OPTV_BOOLEAN, {0}, FALSE }, - { OPTION_FIFO_MODERATE, "fifo_moderate", OPTV_BOOLEAN, {0}, FALSE }, - { OPTION_FIFO_AGGRESSIVE, "fifo_aggressive", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_PCI_RETRY, "pci_retry", OPTV_BOOLEAN, {0}, TRUE }, { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_MCLK, "set_mclk", OPTV_FREQ, {0}, FALSE }, @@ -647,28 +641,6 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "PCI Retry %sabled\n", pSmi->PCIRetry ? "en" : "dis"); - if (xf86IsOptionSet(pSmi->Options, OPTION_FIFO_CONSERV)) { - pSmi->fifo_conservative = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: fifo_conservative " - "set\n"); - } else { - pSmi->fifo_conservative = FALSE; - } - - if (xf86IsOptionSet(pSmi->Options, OPTION_FIFO_MODERATE)) { - pSmi->fifo_moderate = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: fifo_moderate set\n"); - } else { - pSmi->fifo_moderate = FALSE; - } - - if (xf86IsOptionSet(pSmi->Options, OPTION_FIFO_AGGRESSIVE)) { - pSmi->fifo_aggressive = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: fifo_aggressive set\n"); - } else { - pSmi->fifo_aggressive = FALSE; - } - if (xf86ReturnOptValBool(pSmi->Options, OPTION_NOACCEL, FALSE)) { pSmi->NoAccel = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: NoAccel - Acceleration " |