---

yaml --- r: 371641 b: refs/heads/master c: 9fe72f9 h: refs/heads/master i: 371639: 19c7012 v: v3
git-mirror · May 2, 2013 · f38d2b4 · f38d2b4
1 parent b07e28d
commit f38d2b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5398b23a5cdcd1f4901cbce0933937b5509dc72
+refs/heads/master: 9fe72f9e8370f1931e5e3137fe497d6167057340
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -33,6 +33,7 @@
 
 #include <engine/device.h>
 #include <engine/disp.h>
+#include <engine/fifo.h>
 
 #include <subdev/vm.h>
 
@@ -164,7 +165,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
 	u32 arg0, arg1;
 	int ret;
 
-	if (nouveau_noaccel)
+	if (nouveau_noaccel || !nouveau_fifo(device) /*XXX*/)
 		return;
 
 	/* initialise synchronisation routines */