@@ -692,6 +692,15 @@ static void nouveau_apply_noaccel_quirks (struct drm_device *dev)
if (nouveau_noaccel == -1) {
/* If not specified, noaccel should default off */
nouveau_noaccel = 0;
+
+ /* MacBook Pro laptops with 9600GT cards hang with acceleration */
+ /* See https://bugs.launchpad.net/bugs/546393 */
+ if ((dev->pdev->device == 0x0647) &&
+ (dev->pdev->subsystem_vendor == 0x106b)) {
+ nouveau_noaccel = 1;
+ NV_INFO(dev, "Detected MacBook Pro 9600GT chip. "
+ "Disabling acceleration\n");
+ }
}
}