diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/xfree86/exa | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/exa')
| -rw-r--r-- | xorg-server/hw/xfree86/exa/examodule.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/xorg-server/hw/xfree86/exa/examodule.c b/xorg-server/hw/xfree86/exa/examodule.c index 601288c73..bcb6a405c 100644 --- a/xorg-server/hw/xfree86/exa/examodule.c +++ b/xorg-server/hw/xfree86/exa/examodule.c @@ -122,24 +122,25 @@ exaDDXDriverInit(ScreenPtr pScreen) memcpy(pScreenPriv->options, EXAOptions, sizeof(EXAOptions)); xf86ProcessOptions (pScrn->scrnIndex, pScrn->options, pScreenPriv->options); - if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) && - pExaScr->info->offScreenBase < pExaScr->info->memorySize) - { - char *heuristicName; - - heuristicName = xf86GetOptValString (pScreenPriv->options, - EXAOPT_MIGRATION_HEURISTIC); - if (heuristicName != NULL) { - if (strcmp(heuristicName, "greedy") == 0) - pExaScr->migration = ExaMigrationGreedy; - else if (strcmp(heuristicName, "always") == 0) - pExaScr->migration = ExaMigrationAlways; - else if (strcmp(heuristicName, "smart") == 0) - pExaScr->migration = ExaMigrationSmart; - else { - xf86DrvMsg (pScreen->myNum, X_WARNING, - "EXA: unknown migration heuristic %s\n", - heuristicName); + if (pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) { + if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) && + pExaScr->info->offScreenBase < pExaScr->info->memorySize) { + char *heuristicName; + + heuristicName = xf86GetOptValString (pScreenPriv->options, + EXAOPT_MIGRATION_HEURISTIC); + if (heuristicName != NULL) { + if (strcmp(heuristicName, "greedy") == 0) + pExaScr->migration = ExaMigrationGreedy; + else if (strcmp(heuristicName, "always") == 0) + pExaScr->migration = ExaMigrationAlways; + else if (strcmp(heuristicName, "smart") == 0) + pExaScr->migration = ExaMigrationSmart; + else { + xf86DrvMsg (pScreen->myNum, X_WARNING, + "EXA: unknown migration heuristic %s\n", + heuristicName); + } } } |