summaryrefslogtreecommitdiff
path: root/drm/nouveau_drm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-05-02 16:20:44 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-05-02 16:24:09 +1000
commite49e3cdaf65b6b0252ed516688640d369bbb9740 (patch)
treee4035cb8182fbcf7f9f4e72a0db40c90c98e97d9 /drm/nouveau_drm.c
parentdd86ec030ca38e19c6c4a40906aeae291a0f0705 (diff)
downloadnouveau-e49e3cdaf65b6b0252ed516688640d369bbb9740.tar.gz
drm: force noaccel when no PFIFO support present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau_drm.c')
-rw-r--r--drm/nouveau_drm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c
index c33b13fb1..46c152ff0 100644
--- a/drm/nouveau_drm.c
+++ b/drm/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 */