diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-12-05 11:51:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-05 11:51:39 +1000 |
| commit | 55525bdfc00b0b746401f6ea6ed289048e9d06eb (patch) | |
| tree | 8608fdea821245bf47149608dce81702c50b44c0 | |
| parent | 6aa94687233f55a8044efe83cac82b04ab19609f (diff) | |
mga: fix XAA runtime
XAA->USE_XAA add USE_XAA.
Tested-by: Avengence on #xorg-devel
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/mga_dri.c | 2 | ||||
| -rw-r--r-- | src/mga_driver.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index fca1a9c..6ddaaa7 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,9 @@ fi AC_MSG_CHECKING([whether to include XAA support]) AM_CONDITIONAL(XAA, test "x$XAA" = xyes) AC_MSG_RESULT([$XAA]) +if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, 1, [Build support for XAA]) +fi # Properly handle EXA. AC_MSG_CHECKING([whether to enable EXA support]) diff --git a/src/mga_dri.c b/src/mga_dri.c index 3923c04..a1c39f3 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -355,7 +355,7 @@ void MGAGetQuiescence( ScrnInfoPtr pScrn ) MGAWaitForIdleDMA( pScrn ); /* FIXME what about EXA? */ -#ifdef XAA +#ifdef USE_XAA if (!pMga->Exa && pMga->AccelInfoRec) { WAITFIFO( 11 ); OUTREG( MGAREG_MACCESS, pMga->MAccess ); diff --git a/src/mga_driver.c b/src/mga_driver.c index 5603836..f0b5abb 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -87,7 +87,7 @@ #include "mga_macros.h" #include "mga_maven.h" -#ifdef XAA +#ifdef USE_XAA #include "xaa.h" #endif @@ -2144,7 +2144,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) } } else { #endif -#ifdef XAA +#ifdef USE_XAA if (!xf86LoadSubModule(pScrn, "xaa")) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); @@ -3851,7 +3851,7 @@ MGACloseScreen(CLOSE_SCREEN_ARGS_DECL) pMgaEnt->refCount--; } -#ifdef XAA +#ifdef USE_XAA if (pMga->AccelInfoRec) XAADestroyInfoRec(pMga->AccelInfoRec); #endif |