From ea560e25dfcce3750339b477a1a3c05f504cf91e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 10 Jun 2011 10:44:27 +0100
Subject: [PATCH] sna: Workaround the random free of the ScreenPixmap in
 fbCloseScreen

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

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index a02c4d87..60bd53ab 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -744,6 +744,13 @@ static Bool sna_close_screen(int scrnIndex, ScreenPtr screen)
 
 	xf86_cursors_fini(screen);
 
+	/* XXX unhook devPrivate otherwise fbCloseScreen frees it! */
+	if (sna->front) {
+		screen->DestroyPixmap(sna->front);
+		sna->front = NULL;
+		screen->devPrivate = NULL;
+	}
+
 	screen->CloseScreen = sna->CloseScreen;
 	(*screen->CloseScreen) (scrnIndex, screen);