EXA: Allow optimized migration to be enabled with mixed pixmaps.

This was always the intention, I only recently realized it wasn't the case
yet...

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2009-12-28 16:48:18 +01:00 committed by Keith Packard
parent 661630f909
commit d42f396051

View File

@ -122,9 +122,9 @@ exaDDXDriverInit(ScreenPtr pScreen)
memcpy(pScreenPriv->options, EXAOptions, sizeof(EXAOptions)); memcpy(pScreenPriv->options, EXAOptions, sizeof(EXAOptions));
xf86ProcessOptions (pScrn->scrnIndex, pScrn->options, pScreenPriv->options); xf86ProcessOptions (pScrn->scrnIndex, pScrn->options, pScreenPriv->options);
if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) && if (pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) {
pExaScr->info->offScreenBase < pExaScr->info->memorySize) if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) &&
{ pExaScr->info->offScreenBase < pExaScr->info->memorySize) {
char *heuristicName; char *heuristicName;
heuristicName = xf86GetOptValString (pScreenPriv->options, heuristicName = xf86GetOptValString (pScreenPriv->options,
@ -142,6 +142,7 @@ exaDDXDriverInit(ScreenPtr pScreen)
heuristicName); heuristicName);
} }
} }
}
pExaScr->optimize_migration = pExaScr->optimize_migration =
xf86ReturnOptValBool(pScreenPriv->options, xf86ReturnOptValBool(pScreenPriv->options,