diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-05-02 02:20:44 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-05-02 02:23:24 -0400 |
commit | 9fe72f9e8370f1931e5e3137fe497d6167057340 (patch) | |
tree | 9f28a99ef3fd9c82ff9927c3ea73a1b36cf8bc9e | |
parent | e5398b23a5cdcd1f4901cbce0933937b5509dc72 (diff) |
drm/nouveau: force noaccel when no PFIFO support present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index c33b13fb18db..46c152ff0a80 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c | |||
@@ -33,6 +33,7 @@ | |||
33 | 33 | ||
34 | #include <engine/device.h> | 34 | #include <engine/device.h> |
35 | #include <engine/disp.h> | 35 | #include <engine/disp.h> |
36 | #include <engine/fifo.h> | ||
36 | 37 | ||
37 | #include <subdev/vm.h> | 38 | #include <subdev/vm.h> |
38 | 39 | ||
@@ -164,7 +165,7 @@ nouveau_accel_init(struct nouveau_drm *drm) | |||
164 | u32 arg0, arg1; | 165 | u32 arg0, arg1; |
165 | int ret; | 166 | int ret; |
166 | 167 | ||
167 | if (nouveau_noaccel) | 168 | if (nouveau_noaccel || !nouveau_fifo(device) /*XXX*/) |
168 | return; | 169 | return; |
169 | 170 | ||
170 | /* initialise synchronisation routines */ | 171 | /* initialise synchronisation routines */ |