summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2009-07-18 14:56:04 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2009-07-18 14:56:04 +0000
commitaa8e5f082e968599153d66f2ed8221c5bc1e08d4 (patch)
tree9b4f0459b5b42bbd799b4b9d75f62bacc2c07480
parent265cd13272dd9db90b03d42fb7a860a9eddd8d19 (diff)
Accessing a pixmap in fallback if the prepare_access() callback failed
is verboten So don't do it. Treat it the same as every other prepare access call in uxa. This patch sent upstream. ok matthieu@
-rw-r--r--driver/xf86-video-intel/uxa/uxa.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/driver/xf86-video-intel/uxa/uxa.c b/driver/xf86-video-intel/uxa/uxa.c
index b51a282d4..d63e4d6a1 100644
--- a/driver/xf86-video-intel/uxa/uxa.c
+++ b/driver/xf86-video-intel/uxa/uxa.c
@@ -247,9 +247,10 @@ uxa_validate_gc (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
/* We can't inline stipple handling like we do for GCTile because it sets
* fbgc privates.
*/
- uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW);
- fbValidateGC (pGC, changes, pDrawable);
- uxa_finish_access(&pGC->stipple->drawable);
+ if (uxa_prepare_access(&pGC->stipple->drawable, UXA_ACCESS_RW)) {
+ fbValidateGC (pGC, changes, pDrawable);
+ uxa_finish_access(&pGC->stipple->drawable);
+ }
} else {
fbValidateGC (pGC, changes, pDrawable);
}