From patchwork Mon Sep 16 15:04:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11147247 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 453FC17E6 for ; Mon, 16 Sep 2019 15:04:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D8B82067B for ; Mon, 16 Sep 2019 15:04:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D8B82067B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 39F396E9C6; Mon, 16 Sep 2019 15:04:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8319E6E9C3; Mon, 16 Sep 2019 15:04:29 +0000 (UTC) Received: by mail-ed1-x530.google.com with SMTP id h33so330805edh.12; Mon, 16 Sep 2019 08:04:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tEI35h92cKRPz8atJCk7hAGkg2y7SwNbjm+2sjYk9Pk=; b=nMxuE6c53GDwx4R9ckQsSi/vYdDLt2FCOnOcXjsNxZ/htwqZ8dxorFfpQdh/Lq1OrZ hBVO+bAfXcP0RHg0fmRth5wzWyZ5FonJwg1Qojg2lti7I1TVTjz/BoUia8dQz4BlfGa6 PuzU+rJzLFdg3875hn5A7VFgCPg7sWxGZH8FFRu1UOt4ugbsLj9zCT6T5mki9CzvVji0 0vD9shoqNA+gExayRg7ccH71kaJ4waxBIoNxmjTTHDFWCrNkzMnCyfAeYePNGBPgU28j BP2f4T2W3mDRUs8cOjeoZZ3kw5AG5eJ/70aV9I5B+FYa8WPODylfMx2dQ0oieShj2eCF 8dqw== X-Gm-Message-State: APjAAAXndvMZlDDfCP1w18kVLvjfc1j3H9IqaRpZhgxlH1Rc0pC4MqMI 5w4iHq+N2RvwXdKTCpza3J2UOcII X-Google-Smtp-Source: APXvYqzvIaYhzg3s8/ZVisWsNvZKBFDkzIjVhtduBhgMy+imM0QojIwA3iv3W6whbTfuVCGCdfJd+Q== X-Received: by 2002:a17:907:20a2:: with SMTP id pw2mr409608ejb.163.1568646267848; Mon, 16 Sep 2019 08:04:27 -0700 (PDT) Received: from localhost (p2E5BE2CE.dip0.t-ipconnect.de. [46.91.226.206]) by smtp.gmail.com with ESMTPSA id x12sm3576830ejv.69.2019.09.16.08.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 08:04:26 -0700 (PDT) From: Thierry Reding To: Ben Skeggs , Thierry Reding Subject: [PATCH 05/11] drm/nouveau: gp10b: Use correct copy engine Date: Mon, 16 Sep 2019 17:04:06 +0200 Message-Id: <20190916150412.10025-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190916150412.10025-1-thierry.reding@gmail.com> References: <20190916150412.10025-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tEI35h92cKRPz8atJCk7hAGkg2y7SwNbjm+2sjYk9Pk=; b=LTkhXfTW7bFcAfitrOFPNRRYMEvgMbD48xTU63SQYgRdfkR2sIPv9BdrYgCQqV/dA0 b3uq2CmPLGOOIK/tRQ2zHKu3L923Cvc3fOwMjNEI2i/PS/KkodgJ509Cz6Raduix/KYn bu1dEuXHFwO6itMgz9+Zgo7s1nLU0Pn8J+PoRHVhzqy6Bk2ZgG4YPS2k1igDQ05cdIdg msdJpWouJ7rB4+m0U+XY83GuuZnPBxquUzYwBb9Yy4uQZnVPMyOYuvTuNQR3hSiGzrXE nNil+VntfoDP/SNL49VxbUzXXtRKiRd9Ek95dtz1aXnGETMsZoA44VsElviGhA0++CiA y6nw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thierry Reding gp10b uses the new engine enumeration mechanism introduced in the Pascal architecture. As a result, the copy engine, which used to be at index 2 for prior Tegra GPU instantiations, has now moved to index 0. Fix up the index and also use the gp100 variant of the copy engine class because on gp10b the PASCAL_DMA_COPY_B class is not supported. Signed-off-by: Thierry Reding --- 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 d2d6d5f4028a..99d3fa3fad89 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -2387,7 +2387,7 @@ nv13b_chipset = { .pmu = gm20b_pmu_new, .timer = gk20a_timer_new, .top = gk104_top_new, - .ce[2] = gp102_ce_new, + .ce[0] = gp100_ce_new, .dma = gf119_dma_new, .fifo = gp10b_fifo_new, .gr = gp10b_gr_new,