- Minor bugfixes.exa_branch

3 files changed, 11 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f34aa2..acc9450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-29  Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+
+	* unichrome/via_accel.c: (viaInitExa):
+	* unichrome/via_driver.c: (VIAPreInit):
+
+	- Minor bugfixes.
+	
 2006-01-27  Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 
 	* unichrome/via.man:
diff --git a/unichrome/via_accel.c b/unichrome/via_accel.c
index 65a6670..61f8524 100644
--- a/unichrome/via_accel.c
+++ b/unichrome/via_accel.c
@@ -41,8 +41,6 @@
 #include "via_regs.h"
 #include "via_id.h"
 #include "via_dmabuffer.h"
-#include <time.h>
-#include <sys/time.h>
 
 #ifdef X_HAVE_XAAGETROP
 #define VIAACCELPATTERNROP(vRop) (XAAGetPatternROP(vRop) << 24)
@@ -2123,11 +2121,12 @@ viaInitExa(ScreenPtr pScreen)
     pExa->accel.UploadToScratch = viaExaUploadToScratch;
 
     if (!pVia->noComposite) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,"[EXA] Disabling EXA accelerated composite.\n");
 	pExa->accel.CheckComposite = viaExaCheckComposite;
 	pExa->accel.PrepareComposite = viaExaPrepareComposite;
 	pExa->accel.Composite = viaExaComposite;
 	pExa->accel.DoneComposite = viaExaDoneSolidCopy;
+    } else {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,"[EXA] Disabling EXA accelerated composite.\n");
     }
 
     if (!exaDriverInit(pScreen, pExa)) {
diff --git a/unichrome/via_driver.c b/unichrome/via_driver.c
index f0859da..8bec836 100644
--- a/unichrome/via_driver.c
+++ b/unichrome/via_driver.c
@@ -916,10 +916,8 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
 	if (pVia->useEXA) {
 	    if (xf86ReturnOptValBool(VIAOptions, OPTION_EXA_NOCOMPOSITE, FALSE)) {
 		pVia->noComposite = TRUE;
-		if (pVia->agpEnable) {
-		    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-			       "Option: ExaNoComposite - Disable Composite acceleration for EXA\n");
-		}
+		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+			   "Option: ExaNoComposite - Disable Composite acceleration for EXA\n");
 	    } else {
 		pVia->noComposite = FALSE;
 	    }