diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-05-02 10:20:44 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-05-02 10:23:24 +0400 |
| commit | 9fe72f9e8370f1931e5e3137fe497d6167057340 (patch) | |
| tree | 9f28a99ef3fd9c82ff9927c3ea73a1b36cf8bc9e /drivers/gpu | |
| parent | e5398b23a5cdcd1f4901cbce0933937b5509dc72 (diff) | |
| download | linux-9fe72f9e8370f1931e5e3137fe497d6167057340.tar.xz | |
drm/nouveau: force noaccel when no PFIFO support present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -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 @@ #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 */ |