summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2010-01-04 09:07:48 +0100
committerKeith Packard <keithp@keithp.com>2010-01-04 08:28:12 -0800
commite707612e9de4e5e1d91dc1a8152810912d7e18bb (patch)
tree34c76305eaf1f19aac571b8bc7abba993502c3d9
parente10072b7c74a6f5e24f6dfa37e73688d1f3425e3 (diff)
EXA: Restore migration call in exaDoPutImage().
Turns out this is still necessary if the driver PrepareAccess hook succeeds. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Tested-by: Maarten Maathuis <madman2003@gmail.com> Tested-by: Andrew Chant <andrew.chant+debian@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--exa/exa_accel.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 4c55a4c54..4680c3709 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -172,6 +172,17 @@ exaDoPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y,
if (pExaScr->swappedOut)
return FALSE;
+ if (pExaScr->do_migration) {
+ ExaMigrationRec pixmaps[1];
+
+ pixmaps[0].as_dst = TRUE;
+ pixmaps[0].as_src = FALSE;
+ pixmaps[0].pPix = pPix;
+ pixmaps[0].pReg = DamagePendingRegion(pExaPixmap->pDamage);
+
+ exaDoMigration (pixmaps, 1, TRUE);
+ }
+
pPix = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff);
if (!pPix)