From patchwork Sat Aug 4 06:00:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henrik Rydberg X-Patchwork-Id: 1272971 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 375FBDF24C for ; Sat, 4 Aug 2012 06:08:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 40A599F01B for ; Fri, 3 Aug 2012 23:08:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtprelay-b11.telenor.se (smtprelay-b11.telenor.se [62.127.194.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A609F9E775; Fri, 3 Aug 2012 22:58:16 -0700 (PDT) Received: from ipb3.telenor.se (ipb3.telenor.se [195.54.127.166]) by smtprelay-b11.telenor.se (Postfix) with ESMTP id 66254C4F7; Sat, 4 Aug 2012 07:58:15 +0200 (CEST) X-SENDER-IP: [85.230.170.20] X-LISTENER: [smtp.bredband.net] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlJbAGK5HFBV5qoUPGdsb2JhbABFhRIiAYUArwgZAQEBATc0gn0TAQ8YEXEKGhOIEbx2FIs9hnsDmzSNBIFU X-IronPort-AV: E=Sophos;i="4.77,711,1336341600"; d="scan'208";a="168481409" Received: from c-14aae655.710-13-64736c12.cust.bredbandsbolaget.se (HELO polaris) ([85.230.170.20]) by ipb3.telenor.se with SMTP; 04 Aug 2012 07:58:13 +0200 Received: by polaris (sSMTP sendmail emulation); Sat, 04 Aug 2012 08:00:56 +0200 From: "Henrik Rydberg" To: Ben Skeggs Subject: [PATCH] nouveau: Do not use nva3 engine for 0xaf chipset Date: Sat, 4 Aug 2012 08:00:45 +0200 Message-Id: <1344060045-784-1-git-send-email-rydberg@euromail.se> X-Mailer: git-send-email 1.7.11.4 Cc: nouveau@lists.freedesktop.org, Henrik Rydberg , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org The nva3 copy engine exhibits random memory corruption in at least one case, the GeForce 320M (nv50, 0xaf) in the MacBookAir3,1. This patch omits creating the engine for the specific chipset, falling back to M2MF, which kills the symptoms. Signed-off-by: Henrik Rydberg --- Hi Ben, this patch is still needed in 3.6-rc1, so perhaps we should apply it after all. I have been running it without problems for a long time now. Thanks, Henrik drivers/gpu/drm/nouveau/nouveau_state.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 1cdfd6e..1866dbb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -731,7 +731,6 @@ nouveau_card_init(struct drm_device *dev) case 0xa3: case 0xa5: case 0xa8: - case 0xaf: nva3_copy_create(dev); break; }