From 40c9d180bf43af84ae05d88e993deedf76e263e6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 26 Sep 2010 23:09:04 +0100
Subject: [PATCH] Retry framebuffer allocation if first attempt fails.

If we are tiled, we may fail the allocation due to an EIO and so not
being able to set tiling. Try again with an untiled request in this
case.

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

diff --git a/src/intel_memory.c b/src/intel_memory.c
index 4f1b009b..3a25ba6a 100644
--- a/src/intel_memory.c
+++ b/src/intel_memory.c
@@ -209,6 +209,10 @@ retry:
 						width, height, intel->cpp,
 						&tiling_mode, &pitch, 0);
 	if (front_buffer == NULL) {
+		if (tiling_mode != I915_TILING_NONE) {
+			tiling_mode = I915_TILING_NONE;
+			goto retry;
+		}
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Failed to allocate framebuffer.\n");
 		return NULL;