From patchwork Thu Jun 18 14:47:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Courbot X-Patchwork-Id: 6638671 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C6529F358 for ; Thu, 18 Jun 2015 14:48:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8549205ED for ; Thu, 18 Jun 2015 14:48:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B8F1A20808 for ; Thu, 18 Jun 2015 14:48:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C21316ED1E; Thu, 18 Jun 2015 07:48:41 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by gabe.freedesktop.org (Postfix) with ESMTP id B9AE76ED1E; Thu, 18 Jun 2015 07:48:40 -0700 (PDT) Received: by pabvl15 with SMTP id vl15so16865866pab.1; Thu, 18 Jun 2015 07:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ckkpuOyrXADTPXgXbsGoVCchlEQkv/O877Qko4vPb8E=; b=s3NGXiDtMV9GcC6wkupxgHCQEUookjHTxc6LJxxhLgWuZauTaI9Nnie/qzKklUCrM7 jKeW2GB7GSDyclPovNgYDVTwhib1XwDKjYtALewf3josps+whBO9pWVjXCRVvycyocVY f/x+R/+JoKj/D+UO3rwlcEIP9THVts+Pva9lSeEj8XWCKZye+1y3YBZxqn9Pqg3ft+pb UwbsCji9VZqxXxd1B09knJx3R2EgV+QXrD5X604yypz6FO8+Z9YxARQv1x2yRz1xqwBy LHwywlnuvdnq0TstzYCnpZTZj0y+RLmr3cccDcY46bAeSylM5onu22xGlQ2jDrF0ceYf G8dg== X-Received: by 10.70.133.230 with SMTP id pf6mr9280231pdb.56.1434638920450; Thu, 18 Jun 2015 07:48:40 -0700 (PDT) Received: from aramis.localdomain (softbank126227184005.bbtec.net. [126.227.184.5]) by mx.google.com with ESMTPSA id af1sm8396374pad.34.2015.06.18.07.48.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jun 2015 07:48:39 -0700 (PDT) From: Alexandre Courbot X-Google-Original-From: Alexandre Courbot To: Ben Skeggs , nouveau@lists.freedesktop.org, Andy Ritger , Aaron Plattner , Allen Martin , Ken Adams , Terje Bergstrom Subject: [PATCH 5/6] device: recognize GM20B Date: Thu, 18 Jun 2015 23:47:51 +0900 Message-Id: <1434638872-29061-6-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1434638872-29061-1-git-send-email-acourbot@nvidia.com> References: <1434638872-29061-1-git-send-email-acourbot@nvidia.com> Cc: linux-tegra@vger.kernel.org, gnurou@gmail.com, 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Recognize GM20B and assign the right engines and subdevs. Signed-off-by: Alexandre Courbot --- drm/nouveau/nvkm/engine/device/gm100.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drm/nouveau/nvkm/engine/device/gm100.c b/drm/nouveau/nvkm/engine/device/gm100.c index 70abf1e..a51b3ce 100644 --- a/drm/nouveau/nvkm/engine/device/gm100.c +++ b/drm/nouveau/nvkm/engine/device/gm100.c @@ -181,6 +181,26 @@ gm100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_MSPPP ] = &gf100_msppp_oclass; #endif break; + case 0x12b: + device->cname = "GM20B"; + + device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass; + device->oclass[NVDEV_SUBDEV_MMU ] = &gf100_mmu_oclass; + device->oclass[NVDEV_SUBDEV_BUS ] = gf100_bus_oclass; + device->oclass[NVDEV_SUBDEV_FUSE ] = &gm107_fuse_oclass; + device->oclass[NVDEV_SUBDEV_TIMER ] = &gk20a_timer_oclass; + device->oclass[NVDEV_SUBDEV_FB ] = gk20a_fb_oclass; + device->oclass[NVDEV_SUBDEV_LTC ] = gm107_ltc_oclass; + device->oclass[NVDEV_SUBDEV_IBUS ] = &gk20a_ibus_oclass; + device->oclass[NVDEV_SUBDEV_INSTMEM] = gk20a_instmem_oclass; + device->oclass[NVDEV_SUBDEV_MMU ] = &gf100_mmu_oclass; + device->oclass[NVDEV_SUBDEV_BAR ] = &gk20a_bar_oclass; + device->oclass[NVDEV_ENGINE_DMAOBJ ] = gf110_dmaeng_oclass; + device->oclass[NVDEV_ENGINE_FIFO ] = gm20b_fifo_oclass; + device->oclass[NVDEV_ENGINE_SW ] = gf100_sw_oclass; + device->oclass[NVDEV_ENGINE_GR ] = gm20b_gr_oclass; + device->oclass[NVDEV_ENGINE_CE2 ] = &gm204_ce2_oclass; + break; default: nv_fatal(device, "unknown Maxwell chipset\n"); return -EINVAL;