diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-07-09 14:53:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-07-09 14:53:47 +1000 |
| commit | 2556341f8baf0e0b7b5f7843135e43e662751af0 (patch) | |
| tree | 84b591787aa036959e56c490b38dbf9e191c76dd /linux-core/nouveau_drv.c | |
| parent | 38a5f6686cd38d5204e240f30006538bcf70f5ac (diff) | |
| parent | 0b7d9a97bd2383fe4382fc1b1b266542020f0c4e (diff) | |
Merge remote branch 'origin/modesetting-101' into 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); } |