diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-09 10:23:43 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-09 10:23:43 -0800 |
| commit | 6656db10551bbb8770dd945b6d81d5138521f208 (patch) | |
| tree | 68e457660c174ee2e16353691126ddd754c79398 /linux-core/nouveau_drv.c | |
| parent | c99566fb810c9d8cae5e9cd39d1772b55e2f514c (diff) | |
| parent | 12e68f8059485fb4f02a15f74ab2fa3bdff38c81 (diff) | |
Merge branch 'modesetting-gem'
Diffstat (limited to 'linux-core/nouveau_drv.c')
| -rw-r--r-- | linux-core/nouveau_drv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index c8f57dff..04f002f2 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -28,6 +28,9 @@ #include "drm_pciids.h" +unsigned int nouveau_modeset = 0; /* kms */ +module_param_named(modeset, nouveau_modeset, int, 0400); + static struct pci_device_id pciidlist[] = { { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), @@ -104,6 +107,10 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init nouveau_init(void) { driver.num_ioctls = nouveau_max_ioctl; + + if (nouveau_modeset == 1) + driver.driver_features |= DRIVER_MODESET; + return drm_init(&driver, pciidlist); } |