nouveau: disable KMS for pre-NV50 even when specifically enabled
authorMaarten Maathuis <madman2003@gmail.com>
Sun, 22 Jun 2008 17:31:55 +0000 (19:31 +0200)
committerMaarten Maathuis <madman2003@gmail.com>
Sun, 22 Jun 2008 17:31:55 +0000 (19:31 +0200)
shared-core/nouveau_state.c

index 82591c64f956f00185645e4a001d9ccaf1c0d509..9f8fc43de2289f015f63cb01008a294df6014d49 100644 (file)
@@ -557,6 +557,10 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
                return -EINVAL;
        }
 
+       /* For those who think they want to be funny. */
+       if (dev_priv->card_type < NV_50)
+               dev->driver->driver_features &= ~DRIVER_MODESET;
+
        /* Special flags */
        if (dev->pci_device == 0x01a0) {
                dev_priv->flags |= NV_NFORCE;