Fix the dma2d option setting.

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 15920a9..3121b02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-05 Thomas Hellstrom  <thomas-at-tungstengraphics-dot-com> 
+	
+	* unichrome/via_driver.c: (VIAPreInit):
+
+	Fix the dma2d option setting.
+
 2006-12-05  Thomas Hellstrom  <thomas-at-tungstengraphics-dot-com> 
 
 	* unichrome/via_bandwidth.c: (ViaSetPrimaryFIFO):
diff --git a/unichrome/via_driver.c b/unichrome/via_driver.c
index e73310b..3e580cb 100644
--- a/unichrome/via_driver.c
+++ b/unichrome/via_driver.c
@@ -991,6 +991,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
     if (pVia->agpEnable) {
 	from = xf86GetOptValBool(VIAOptions, OPTION_2D_DMA, &pVia->dma2d)
 	    ? X_CONFIG : X_DEFAULT;
+	if (from == X_CONFIG)
+	    pVia->dma2d = !pVia->dma2d;
 	xf86DrvMsg(pScrn->scrnIndex, from, "AGP DMA will %sbe used for 2D "
 		   "acceleration.\n",
 		   (pVia->dma2d) ? "" : "not ");