From c74464d92cd673ff0669375757caab798cc57e95 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 15 Mar 2006 16:59:45 +0000 Subject: [PATCH] =?UTF-8?q?Don't=20let=20pinned=20pixmaps=20get=20migrated?= =?UTF-8?q?=20in=20when=20using=20the=20"Always"=20migration=20=20=20=20?= =?UTF-8?q?=20scheme.=20This=20notably=20keeps=20the=20visible=20screen=20?= =?UTF-8?q?from=20getting=20migrated=20in=20=20=20=20=20to=20a=20new=20loc?= =?UTF-8?q?ation=20in=20framebuffer.=20Reported=20by:=20Michel=20D=C3=A4nz?= =?UTF-8?q?er.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 9 +++++++++ exa/exa_migration.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3ea95efc3..488b54e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-03-15 Eric Anholt + + * 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 * hw/xfree86/loader/loadmod.c: diff --git a/exa/exa_migration.c b/exa/exa_migration.c index ce4ce7455..68f88047c 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -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),