diff options
| author | Dave Airlie <airlied@gmail.com> | 2012-07-15 19:41:28 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2012-07-15 19:41:28 +1000 |
| commit | f11a407ceb0857bb0d33811511117b490a8ae6ee (patch) | |
| tree | a11bad19014270c1d7bf4f27a261f3992e4e281c /src/mga_video.c | |
| parent | fa0f3092ed38ce71ba9f65156bde306eb63feaf8 (diff) | |
mga: fix after XAA removal
Fix mga build after XAA removal.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mga_video.c')
| -rw-r--r-- | src/mga_video.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mga_video.c b/src/mga_video.c index 00e026d..535e329 100644 --- a/src/mga_video.c +++ b/src/mga_video.c @@ -14,7 +14,6 @@ #include "mga_macros.h" #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xaa.h" #ifdef USE_XAA #include "xaa.h" @@ -1987,9 +1986,11 @@ MGAPutImageILOAD( bpp = pScrn->bitsPerPixel >> 3; +#ifdef HAVE_XAA_H if( pMga->AccelInfoRec->NeedToSync && ((long)data != pPriv->lastPort) ) { MGAStormSync(pScrn); } +#endif pPriv->lastPort = (long)data; nbox=REGION_NUM_RECTS(clipBoxes); @@ -2019,8 +2020,9 @@ MGAPutImageILOAD( pbox++; } - +#ifdef HAVE_XAA_H pMga->AccelInfoRec->NeedToSync = TRUE; +#endif pPriv->videoStatus = FREE_TIMER; pPriv->freeTime = currentTime.milliseconds + FREE_DELAY; pMga->VideoTimerCallback = MGAVideoTimerCallback; |