Don't let pinned pixmaps get migrated in when using the "Always" migration

scheme. This notably keeps the visible screen from getting migrated in
    to a new location in framebuffer.
Reported by: Michel Dänzer.
This commit is contained in:
Eric Anholt 2006-03-15 16:59:45 +00:00
parent b9c43cde1e
commit c74464d92c
2 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,12 @@
2006-03-15 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_migration.c: (exaMoveInPixmap):
Don't let pinned pixmaps get migrated in when using the "Always"
migration scheme. This notably keeps the visible screen from getting
migrated in to a new location in framebuffer.
Reported by: Michel Dänzer.
2006-03-15 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/loader/loadmod.c:

View File

@ -171,6 +171,9 @@ exaMoveInPixmap (PixmapPtr pPixmap)
char *dst, *src;
int i;
if (exaPixmapIsPinned(pPixmap))
return;
DBG_MIGRATE (("-> 0x%lx (0x%x) (%dx%d)\n", pPixmap->drawable.id,
(ExaGetPixmapPriv(pPixmap)->area ?
ExaGetPixmapPriv(pPixmap)->area->offset : 0),