From patchwork Fri Sep 17 16:17:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 65088 X-Patchwork-Delegate: leann.ogasawara@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 6A059B70A8 for ; Sat, 18 Sep 2010 02:18:09 +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 1OwddU-0003Wc-AR; Fri, 17 Sep 2010 17:18:04 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OwddP-0003UX-3O for kernel-team@lists.ubuntu.com; Fri, 17 Sep 2010 17:17:59 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OwddP-0001JF-0j for ; Fri, 17 Sep 2010 17:17:59 +0100 Received: from 212-139-221-210.dynamic.dsl.as9105.com ([212.139.221.210] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OwddO-000895-TI for kernel-team@lists.ubuntu.com; Fri, 17 Sep 2010 17:17:59 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: SAUCE: Nouveau: Disable acceleration on MacBook Pros Date: Fri, 17 Sep 2010 17:17:56 +0100 Message-Id: <1284740276-5551-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1284740276-5551-1-git-send-email-apw@canonical.com> References: <1284740276-5551-1-git-send-email-apw@canonical.com> 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 From: Christopher James Halse Rogers BugLink: http://bugs.launchpad.net/bugs/546393 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. Signed-off-by: Christopher James Halse Rogers Acked-by: Andy Whitcroft Signed-off-by: Andy Whitcroft --- drivers/gpu/drm/nouveau/nouveau_state.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 00a4e88..f93278d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -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"); + } } }