diff --git a/[refs] b/[refs] index 56860f0d3471..a62d8be17e99 100644 --- 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 index f65811c3eb4d..a0e17340e145 100644 --- 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: