From patchwork Sat Mar 18 20:23:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 9632315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E22AC602D6 for ; Sat, 18 Mar 2017 20:23:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D500C28334 for ; Sat, 18 Mar 2017 20:23:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8B7728358; Sat, 18 Mar 2017 20:23:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5F7EC28334 for ; Sat, 18 Mar 2017 20:23:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BC0B6E29A; Sat, 18 Mar 2017 20:23:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id D93E66E29A; Sat, 18 Mar 2017 20:23:25 +0000 (UTC) Received: by mail-qk0-x241.google.com with SMTP id n141so13736886qke.3; Sat, 18 Mar 2017 13:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=DvfjA7+YvcsBAFsSBea8zdv+cN1XlI3PObuIj9KQr1s=; b=LvWFEHURmWbwujaYyRN/iTPlEx+5N9ffcCoPEaVLMQwBvAsGJCLn0DFLsfOPFMZ4xm 4ia8QedKgdZCpTlL29yHd7VszBOk+LmbQezTGNjfRc/pfqI/P4G1gI5Nuia3nEHhpv36 d5rCpQgpgD3f1fbklbQpCYMjsZHFF/j+LaUOe9a+AAWaJUyDjo0flQO1d4nk/bclZkNM 4U3MZUpYQGXGiNaJSjYPzFjTM82PSqaVTXuhntgoBU+DCFvMLfv/G/8TDjc9GnyxEutK DzSJStxhbTFAl3SnoNkCTB0Eyw1bz2lTco1hAUlSb5hJRMYLyfs857IfmuNSq6aimjsw oRvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=DvfjA7+YvcsBAFsSBea8zdv+cN1XlI3PObuIj9KQr1s=; b=OnB4v4OqtJPngOXtBpStj2YYAIyBBuhea7LrhvoHvJxLc/k+9ngasyJT0XXNKTe7ZA 9ntW55dVQACsj8mEXjLNIkwldin4p6y96lbCJPV55CCYdO3luvXAnbz2Y9GL2ChanZbS SMqdcolrkjX7LmfhFIXAFQgf76EyZbQiRSlrFnJIPCj1ow8hosCgEom45KiumYKAiTh0 OtPfhcS/LS/9ktTd+/4cM0K37JCS24/DfOW7UxqmqnBZWTqTPlzMku3rccarc7qDPIus BYZeRjz0MBS3+EDoc0vRigbFyHve5X+3p+6yOOxE1UE7n4h0LzHCHxUbzEUu4S+IIvbK K+2A== X-Gm-Message-State: AFeK/H39pQZdrF3QYZ8FXX4ItsdZHtBBl91a0JgELC2cBqYqGG35nf1Tr95hgrx0+auIiw== X-Received: by 10.55.77.79 with SMTP id a76mr18321239qkb.127.1489868604945; Sat, 18 Mar 2017 13:23:24 -0700 (PDT) Received: from localhost.localdomain ([2604:2000:e348:9900:a242:3fff:feb0:9f80]) by smtp.gmail.com with ESMTPSA id y52sm8810112qty.60.2017.03.18.13.23.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Mar 2017 13:23:24 -0700 (PDT) From: Ilia Mirkin To: Ben Skeggs , Dave Airlie Subject: [PATCH] drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one Date: Sat, 18 Mar 2017 16:23:10 -0400 Message-Id: <20170318202310.4940-1-imirkin@alum.mit.edu> X-Mailer: git-send-email 2.10.2 Cc: nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The NV4A (aka NV44A) is an oddity in the family. It only comes in AGP and PCI varieties, rather than a core PCIE chip with a bridge for AGP/PCI as necessary. As a result, it appears that the MMU is also non-functional. For AGP cards, the vast majority of the NV4A lineup, this worked out since we force AGP cards to use the nv04 mmu. However for PCI variants, this did not work. Switching to the NV04 MMU makes it work like a charm. Thanks to mwk for the suggestion. This should be a no-op for NV4A AGP boards, as they were using it already. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388 Signed-off-by: Ilia Mirkin Cc: stable@vger.kernel.org --- OK, so I'm not 100% sure about my claims, but I don't have the necessary hardware to test it out. Right now, AGP nv41+ boards are getting the nv04 mmu, while PCI nv41+ boards are getting the PCIE one. Perhaps this works for them, however such boards are rare, and I don't have one. Perhaps all PCI boards should be routed to the nv04 mmu, not just the NV4A ones. drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 273562d..0fc41db 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -714,7 +714,7 @@ nv4a_chipset = { .i2c = nv04_i2c_new, .imem = nv40_instmem_new, .mc = nv44_mc_new, - .mmu = nv44_mmu_new, + .mmu = nv04_mmu_new, .pci = nv40_pci_new, .therm = nv40_therm_new, .timer = nv41_timer_new,