xserver: Branch 'server-1.9-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Feb 7 10:07:10 PST 2011
exa/exa.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0a4b0de9afeab0cd47e1e297d5b5d42bfda0a5a7
Author: Maarten Maathuis <madman2003 at gmail.com>
Date: Sun Jan 30 14:06:15 2011 +0100
exa: Only call driver FinishAccess hook if PrepareAccess hook succeeded.
Reviewed-by: Michel Dänzer <michel at daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003 at gmail.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit af87f6367ef733d1a4f3cfca4eeb92bfd84c2b6f)
diff --git a/exa/exa.c b/exa/exa.c
index 8adf847..a4e294a 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -421,7 +421,8 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
/* We always hide the devPrivate.ptr. */
pPixmap->devPrivate.ptr = NULL;
- if (!pExaScr->info->FinishAccess || !exaPixmapHasGpuCopy(pPixmap))
+ /* Only call FinishAccess if PrepareAccess was called and succeeded. */
+ if (!pExaScr->info->FinishAccess || !pExaScr->access[i].retval)
return;
if (i >= EXA_PREPARE_AUX_DEST &&
More information about the xorg-commit
mailing list