From 4d8d2edf33f85d54e9766290188199bc69985b07 Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers Date: Tue, 13 Apr 2010 19:36:39 +1000 Subject: [PATCH 4/4] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100 cards Upstream obviously wants to fix acceleration rather than disable it. For Lucid however we need these cards to boot more than we need them to be fast. With acceleration enabled these cards hang during boot. BugLink: http://bugs.launchpad.net/bugs/542950 Signed-off-by: Christopher James Halse Rogers Signed-off-by: Andy Whitcroft --- drivers/gpu/drm/nouveau/nouveau_state.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 63014f4..a112998 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -621,6 +621,13 @@ static void nouveau_apply_noaccel_quirks (struct drm_device *dev) NV_INFO(dev, "Detected NV20 (GeForce 3) chip. " "Disabling acceleration\n"); } + /* GeForce 6100 cards also hang with acceleration */ + /* See https://bugs.launchpad.net/bugs/542950 */ + if (dev->pdev->device == 0x0242) { + nouveau_noaccel = 1; + NV_INFO(dev, "Detected GeForce 6100 chip. " + "Disabling acceleration\n"); + } } } -- 1.7.0