From patchwork Tue Apr 13 11:31:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher James Halse Rogers X-Patchwork-Id: 50061 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id ADB8EB6ED0 for ; Tue, 13 Apr 2010 21:32:11 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1eLa-0000zP-U4; Tue, 13 Apr 2010 12:32:02 +0100 Received: from qw-out-1920.google.com ([74.125.92.144]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1eLY-0000yP-95 for kernel-team@lists.ubuntu.com; Tue, 13 Apr 2010 12:32:00 +0100 Received: by qw-out-1920.google.com with SMTP id 4so2254538qwk.20 for ; Tue, 13 Apr 2010 04:31:59 -0700 (PDT) Received: by 10.229.26.135 with SMTP id e7mr6522837qcc.58.1271158319269; Tue, 13 Apr 2010 04:31:59 -0700 (PDT) Received: from [192.168.1.2] (ppp121-44-80-16.lns20.syd6.internode.on.net [121.44.80.16]) by mx.google.com with ESMTPS id v37sm7438180qce.0.2010.04.13.04.31.57 (version=SSLv3 cipher=RC4-MD5); Tue, 13 Apr 2010 04:31:58 -0700 (PDT) Subject: Re: Patch: SAUCE: Disable acceleration on GeForce 6100 From: Christopher James Halse Rogers To: kernel-team@lists.ubuntu.com In-Reply-To: <20100409150504.GU31178@shadowen.org> References: <1270717848.8368.42.camel@Spike> <20100409150504.GU31178@shadowen.org> Date: Tue, 13 Apr 2010 21:31:54 +1000 Message-ID: <1271158314.4709.5.camel@Spike> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Mime-version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This extra quirk applies on the top of the previous 3 patches. Subject: [PATCH] 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 From 9532aca5caedaf43086b68c1352422c727373f46 Mon Sep 17 00:00:00 2001 From: Christopher James Halse Rogers Date: Tue, 13 Apr 2010 19:36:39 +1000 Subject: [PATCH] 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 --- 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.4