---

yaml --- r: 260105 b: refs/heads/master c: ad830d2 h: refs/heads/master i: 260103: 9d0284b v: v3
git-mirror · Jun 23, 2011 · 4ac62cf · 4ac62cf
1 parent 992ecb4
commit 4ac62cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 752ab0a0927add86c8b6604e01147041509b2af4
+refs/heads/master: ad830d23d31a51997ca0780dddbe919eb1bfb879
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -946,6 +946,8 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
 		case 0xc1: /* known broken */
 		case 0xc8: /* never tested */
 		case 0xce: /* never tested */
+			NV_INFO(dev, "acceleration disabled by default, pass "
+				     "noaccel=0 to force enable\n");
 			dev_priv->noaccel = true;
 			break;
 		default: