Remove the ZoomOnLCD option and update manpage for PCIRetry.

  ZoomOnLCD controlled if Ctrl/Alt/+ or Ctrl/Alt/- could be used to
reprogram the mode on the panel. The option was not used, and now, if
different resolutions could be used, it should be advertised by randr.

  PCIBurst and PCIRetry options are now enabled by default.

  The fifo_xxx options need a review, as they appear to be associated
with the older WaitQueue macro, that did ignore its argument. But these
options are not used, and may be removed or reimplemented at some time.

3 files changed, 9 insertions, 23 deletions

diff --git a/man/siliconmotion.man b/man/siliconmotion.man
index 769a181..8d23e7f 100644
--- a/man/siliconmotion.man
+++ b/man/siliconmotion.man
@@ -108,14 +108,10 @@ Turn on interlaced video capturing.  Default: off.
 Use the BIOS to set the modes. This is used for custom panel timings.
 Default: on.
 .TP
-.BI "Option \*qZoomOnLCD\*q \*q" boolean \*q
-Allow changing resolution on LCD (Ctrl-Alt-Plus and Ctrl-Alt-Minus).
-Default: off.
-.TP
 .BI "Option \*qDualhead\*q \*q" boolean \*q
 Enable dualhead mode.
-Currently not all chips are supported and hardware video overlay (XV)
-will only work on the secondary VGA output.
+Currently not all chips are supported and on lynx chipsets hardware video
+overlay (XV) will only work on the secondary VGA output.
 Default: off.
 .TP
 .BI "Option \*qPanelSize\*q \*q" width x height \*q
@@ -193,18 +189,20 @@ The following PCI bus
 .B Options
 are supported:
 .TP
-.BI "Option \*qpci_burst\*q \*q" boolean \*q
+.BI "Option \*qPciBurst\*q \*q" boolean \*q
 will enable PCI burst mode. This should work on all but a
-few broken PCI chipsets, and will increase performance.  Default: off.
+few broken PCI chipsets, and will increase performance.  Default: on.
 .TP
-.BI "Option \*qpci_retry\*q \*q" boolean \*q
+.BI "Option \*qPciRetry\*q \*q" boolean \*q
 will allow the driver to rely on PCI Retry to program the registers.
-.B "pci_burst"
+.B "PciBurst"
 must be enabled for this to work. 
 This will increase performance, especially for small fills/blits, 
 because the driver does not have to poll the card before sending it
 commands to make sure it is ready. It should work on most 
-recent PCI chipsets.  Default: off.
+recent PCI chipsets.  Default: value of
+.I PciBurst
+option.
 
 .SH SEE ALSO
 __xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
diff --git a/src/smi.h b/src/smi.h
index 0a51c23..8b0c342 100644
--- a/src/smi.h
+++ b/src/smi.h
@@ -206,7 +206,6 @@ typedef struct
 					   printed using a counter */
 
     Bool		useBIOS;	/* Use BIOS for mode sets */
-    Bool		zoomOnLCD;	/* Zoom on LCD */
     XAAInfoRecPtr	XAAInfoRec;	/* XAA info Rec */
 
     /* EXA */
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 9bfc712..a96321a 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -161,7 +161,6 @@ typedef enum
     OPTION_INTERLACED,
     /* end CZ */
     OPTION_USEBIOS,
-    OPTION_ZOOMONLCD,
     OPTION_DUALHEAD,
     OPTION_ACCELMETHOD,
     OPTION_PANEL_SIZE,
@@ -187,7 +186,6 @@ static const OptionInfoRec SMIOptions[] =
     { OPTION_INTERLACED,     "Interlaced",        OPTV_BOOLEAN, {0}, FALSE },
     /* end CZ */
     { OPTION_USEBIOS,	     "UseBIOS",		  OPTV_BOOLEAN,	{0}, FALSE },
-    { OPTION_ZOOMONLCD,	     "ZoomOnLCD",	  OPTV_BOOLEAN,	{0}, FALSE },
     { OPTION_DUALHEAD,	     "Dualhead",	  OPTV_BOOLEAN,	{0}, TRUE },
     { OPTION_ACCELMETHOD,    "AccelMethod",       OPTV_STRING,  {0}, FALSE },
     { OPTION_PANEL_SIZE,     "PanelSize",	  OPTV_ANYSTR,	{0}, FALSE },
@@ -735,15 +733,6 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
 	pSmi->useBIOS = TRUE;
     }
 
-    if (xf86GetOptValBool(pSmi->Options, OPTION_ZOOMONLCD, &pSmi->zoomOnLCD)) {
-	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: ZoomOnLCD %s.\n",
-		   pSmi->zoomOnLCD ? "enabled" : "disabled");
-    }
-    else {
-	/* Default to ZoomOnLCD enabled. */
-	pSmi->zoomOnLCD = TRUE;
-    }
-
     if (pSmi->useBIOS) {
 	if (xf86LoadSubModule(pScrn,"int10")) {
 	    xf86LoaderReqSymLists(int10Symbols,NULL);