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 c33b13fb18db08f25565753b46ebc6b1420d30f4..46c152ff0a80f41a102a332a2378867cf0e88f3a 100644 (file)
--- 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 */