diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-02 17:33:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-02 17:33:25 +1000 |
| commit | f468400664e3ae79e6e001bb2820c79bebe6aa41 (patch) | |
| tree | 0f78e9bfe17bfa2e05ed804582e484d458d2cb8f /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | b11b88ef0e07a1ea9a3df6666ba8e15833facc67 (diff) | |
| parent | 7b4f638b3a611118324328a18c842e26996493fe (diff) | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Add GK110 modesetting suport.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nve0: recognise nvf0 as a kepler board (GK110)
drm/nouveau: force noaccel when no PFIFO support present
drm/nvf0/disp: expose display class 2.2
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -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 c33b13fb18d..46c152ff0a8 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 */ |