From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 2 May 2013 06:20:44 +0000 (+1000)
Subject: drm/nouveau: force noaccel when no PFIFO support present
X-Git-Tag: v3.10-rc5~7^2^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9fe72f9e8370f1931e5e3137fe497d6167057340;p=platform%2Fkernel%2Flinux-stable.git

drm/nouveau: force noaccel when no PFIFO support present

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index c33b13f..46c152f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/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 */