From 4dfa13c77a1f6cee1affea05b5f3a0b26827d366 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Thu, 23 Oct 2014 08:21:55 +0200
Subject: rework initialization to prevent some crashes

---
 src/nv_driver.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 8c33e0e..e726292 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1352,8 +1352,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
 
 	nouveau_copy_init(pScreen);
-	nouveau_sync_init(pScreen);
-	nouveau_dri2_init(pScreen);
 
 	/* Allocate and map memory areas we need */
 	if (!NVMapMem(pScrn))
@@ -1462,15 +1460,17 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
 	xf86SetBlackWhitePixels(pScreen);
 
 	nouveau_present_init(pScreen);
+	nouveau_sync_init(pScreen);
+	nouveau_dri2_init(pScreen);
 	if (pNv->AccelMethod == GLAMOR) {
 		if (!nouveau_glamor_init(pScreen))
 			return FALSE;
 	} else
 	if (pNv->AccelMethod == EXA) {
-		if (!nouveau_exa_init(pScreen))
+		if (!nouveau_dri3_screen_init(pScreen))
 			return FALSE;
 
-		if (!nouveau_dri3_screen_init(pScreen))
+		if (!nouveau_exa_init(pScreen))
 			return FALSE;
 	}
 
-- 
cgit v1.2.3