xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Thu Nov 5 13:30:12 PST 2009
exa/exa_driver.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 964040764387d89ef64324cfbee31872ee6ce41c
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Wed Nov 4 15:35:37 2009 +0200
EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
It crash the server when the drawable is 32 bit and the framebuffer is 16.
This is pretty much a copy-past from commit 8e873185.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index 9703695..a9165a1 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -204,11 +204,13 @@ exaPixmapIsOffscreen_driver(PixmapPtr pPixmap)
{
ScreenPtr pScreen = pPixmap->drawable.pScreen;
ExaScreenPriv(pScreen);
+ pointer saved_ptr;
Bool ret;
+ saved_ptr = pPixmap->devPrivate.ptr;
pPixmap->devPrivate.ptr = ExaGetPixmapAddress(pPixmap);
ret = pExaScr->info->PixmapIsOffscreen(pPixmap);
- pPixmap->devPrivate.ptr = NULL;
+ pPixmap->devPrivate.ptr = saved_ptr;
return ret;
}
More information about the xorg-commit
mailing list