diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-12-02 22:51:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-12-02 22:51:27 +0000 |
| commit | e679abc2324fd66d1ea6676a340caaecefaa1341 (patch) | |
| tree | 4c9a4245a3e430192cc2b80dc38f5a6d733ede72 /driver/xf86-video-mga | |
| parent | 33eac2e3fe2a9af547dc43981b8f0e51ed2610cb (diff) | |
Fix XAA support. Problem noticed by sthen@
Diffstat (limited to 'driver/xf86-video-mga')
| -rw-r--r-- | driver/xf86-video-mga/configure.ac | 3 | ||||
| -rw-r--r-- | driver/xf86-video-mga/src/mga_dri.c | 2 | ||||
| -rw-r--r-- | driver/xf86-video-mga/src/mga_driver.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/driver/xf86-video-mga/configure.ac b/driver/xf86-video-mga/configure.ac index fca1a9cec..5fa9f8990 100644 --- a/driver/xf86-video-mga/configure.ac +++ b/driver/xf86-video-mga/configure.ac @@ -138,6 +138,9 @@ if test "x$XAA" != xno; then CFLAGS=$XORG_CFLAGS CPPFLAGS="$XORG_CFLAGS" AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + if test "x$XAA" = xyes; then + AC_DEFINE(USE_XAA, 1, [Build support for xaa]) + fi CFLAGS=$save_CFLAGS CPPFLAGS=$save_CPPFLAGS fi diff --git a/driver/xf86-video-mga/src/mga_dri.c b/driver/xf86-video-mga/src/mga_dri.c index 3923c04ac..a1c39f32e 100644 --- a/driver/xf86-video-mga/src/mga_dri.c +++ b/driver/xf86-video-mga/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/driver/xf86-video-mga/src/mga_driver.c b/driver/xf86-video-mga/src/mga_driver.c index 8c4bb9c3c..ace9b167a 100644 --- a/driver/xf86-video-mga/src/mga_driver.c +++ b/driver/xf86-video-mga/src/mga_driver.c @@ -87,7 +87,7 @@ #include "mga_macros.h" #include "mga_maven.h" -#ifdef XAA +#ifdef HAVE_XAA_H #include "xaa.h" #endif @@ -2115,7 +2115,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"); @@ -3765,7 +3765,7 @@ MGACloseScreen(CLOSE_SCREEN_ARGS_DECL) pMgaEnt->refCount--; } -#ifdef XAA +#ifdef USE_XAA if (pMga->AccelInfoRec) XAADestroyInfoRec(pMga->AccelInfoRec); #endif |