From 703cf8abdbcda783e2bb0ceb423909ee8ca98176 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 4 Nov 2011 15:24:57 +0000
Subject: [PATCH] sna: Add earlier guards against to wedged to sna_glyph_blt

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_accel.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 48d3d6a4..45050394 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -6829,6 +6829,11 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
 	DBG(("%s (%d, %d) x %d, transparent? %d, alu=%d\n",
 	     __FUNCTION__, _x, _y, _n, transparent, rop));
 
+	if (wedged(sna)) {
+		DBG(("%s -- fallback, wedged\n", __FUNCTION__));
+		return false;
+	}
+
 	if (!sna_drawable_use_gpu_bo(drawable, &clip->extents, &damage))
 		return false;