Make EXA support on EXA_VERSION_MAJOR >= 2.

Catch the two places where we tried to use EXA stuff when it wasn't available.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/amd.h b/src/amd.h
index be51d83..81cea64 100644
--- a/src/amd.h
+++ b/src/amd.h
@@ -28,9 +28,13 @@
 #ifndef _AMD_GEODE_H_
 #define _AMD_GEODE_H_
 
+#if (EXA_VERSION_MAJOR >= 2)
 #ifndef XF86EXA
 #define XF86EXA 1
 #endif
+#else
+#undef XF86EXA
+#endif
 
 #include "xaa.h"
 #include "exa.h"
diff --git a/src/amd_gx_driver.c b/src/amd_gx_driver.c
index 7f181f0..8eedcc5 100644
--- a/src/amd_gx_driver.c
+++ b/src/amd_gx_driver.c
@@ -689,12 +689,14 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
         pGeode->NoOfColorExpandLines = 0;
 
 
+#ifdef XF86EXA
     if (!xf86GetOptValInteger(GeodeOptions, GX_OPTION_EXA_SCRATCH_BFRSZ,
             &(pGeode->exaBfrSz)))
         pGeode->exaBfrSz = DEFAULT_EXA_SCRATCH_BFRSZ;
 
     if (pGeode->exaBfrSz <= 0)
         pGeode->exaBfrSz = 0;
+#endif
 
   
 
@@ -1550,11 +1552,13 @@ GXCloseScreen(int scrnIndex, ScreenPtr pScrn)
         pGeode->AccelColorExpandBuffers = NULL;
     }
 
+#ifdef XF86EXA
     if (pGeode->pExa) {
         exaDriverFini(pScrn);
         xfree(pGeode->pExa);
         pGeode->pExa = NULL;
     }
+#endif
 
     pScrni->vtSema = FALSE;