xf86-video-intel: uxa/uxa-accel.c

[Eric Anholt]

 uxa/uxa-accel.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit a94ae175d6a69243a4465de0be0a8a3368e0ab28
Author: Eric Anholt <eric at anholt.net>
Date:   Fri May 28 12:40:02 2010 -0700

    uxa: Fix prepare_solid being called without check_solid first.
    
    Fixes GPU hang on gen6.

diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 9a4b4e7..d4475c6 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,