From a938673ee84d51ef655c37dfa7bbc5c35334cd28 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 2 Dec 2009 20:51:53 +0000 Subject: batch: Downgrade batch submission from a FatalError. If we wedge the GPU then we will return -EIO for the current batch and then attempt to reset the GPU. Meanwhile the X server detects the error, throws a FatalError and to all intents and purposes appears to crash to the user - whereas before it often just appeared to momentarily freeze. Of course, on older hardware the server remains frozen until we can find a way to reset those GPUs at runtime. Signed-off-by: Chris Wilson --- src/i830_batchbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c index 9d691d16..12e044af 100644 --- a/src/i830_batchbuffer.c +++ b/src/i830_batchbuffer.c @@ -160,7 +160,9 @@ void intel_batch_flush(ScrnInfoPtr scrn) dri_bo_exec(intel->batch_bo, intel->batch_used, NULL, 0, 0xffffffff); if (ret != 0) - FatalError("Failed to submit batchbuffer: %s\n", + xf86DrvMsg(scrn->scrnIndex, X_ERROR, + "Failed to submit batch buffer, expect rendering corruption " + "or even a frozen display: %s.\n", strerror(-ret)); while (!list_is_empty(&intel->batch_pixmaps)) { -- cgit v1.2.3