fix some config options that are negatives

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1726807..f52eced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-06  Jon Nettleton  <jon-dot-nettleton-at-gmail-dot-com>
+
+        * unichrome/via_driver.c:
+ 
+        Fixed some of the boolean option changes that need
+        to be negated such as DisableIRQ. 
+
 2006-12-06  Thomas Hellstrom  <thomas-at-tungstengraphics-dot-com> 
 
 	* unichrome/via_memory.c: (viaExaFBSave), (viaOffScreenLinear):
diff --git a/unichrome/via_driver.c b/unichrome/via_driver.c
index 89fc576..5055660 100644
--- a/unichrome/via_driver.c
+++ b/unichrome/via_driver.c
@@ -971,6 +971,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     pVia->VQEnable = TRUE;
     from = xf86GetOptValBool(VIAOptions, OPTION_DISABLEVQ, &pVia->VQEnable)
 	? X_CONFIG : X_DEFAULT;
+    if (from == X_CONFIG)
+         pVia->VQEnable = !pVia->VQEnable;
     xf86DrvMsg(pScrn->scrnIndex, from, "GPU virtual command queue will be %s.\n",
 	       (pVia->VQEnable) ? "enabled" : "disabled");
 
@@ -978,6 +980,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     from = xf86GetOptValBool(VIAOptions, OPTION_DISABLEIRQ, 
 			     &pVia->DRIIrqEnable)
 	? X_CONFIG : X_DEFAULT;
+    if (from == X_CONFIG)
+         pVia->DRIIrqEnable = !pVia->DRIIrqEnable;
     xf86DrvMsg(pScrn->scrnIndex, from, "DRI IRQ will be %s if DRI is enabled.\n",
 	       (pVia->DRIIrqEnable) ? "enabled" : "disabled");
 
@@ -1001,6 +1005,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     pVia->dmaXV = TRUE;
     from = xf86GetOptValBool(VIAOptions, OPTION_XV_DMA, &pVia->dmaXV)
 	? X_CONFIG : X_DEFAULT;	
+    if (from == X_CONFIG)
+         pVia->dmaXV = !pVia->dmaXV;
     xf86DrvMsg(pScrn->scrnIndex, from, "PCI DMA will %sbe used for XV "
 	       "image transfer if DRI is enabled.\n",
 	       (pVia->dmaXV) ? "" : "not ");