summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-05-28 12:40:02 -0700
committerEric Anholt <eric@anholt.net>2010-05-28 12:40:46 -0700
commita94ae175d6a69243a4465de0be0a8a3368e0ab28 (patch)
treeef4be6bae121da246c02e87c8c0c09c7fc9d4bef
parent66c90158e45e890c6f655195c6707d216c7ac4c5 (diff)
uxa: Fix prepare_solid being called without check_solid first.
Fixes GPU hang on gen6.
-rw-r--r--uxa/uxa-accel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 9a4b4e7e..d4475c6a 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -916,6 +916,11 @@ uxa_poly_fill_rect(DrawablePtr pDrawable,
goto fallback;
}
+ if (uxa_screen->info->check_solid &&
+ !uxa_screen->info->check_solid(pDrawable, pGC->alu, pGC->planemask)) {
+ goto fallback;
+ }
+
if (!(*uxa_screen->info->prepare_solid) (pPixmap,
pGC->alu,
pGC->planemask,