From patchwork Mon Dec 9 12:00:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 11279271 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 AFDC0112B for ; Mon, 9 Dec 2019 12:00:39 +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 97A232077B for ; Mon, 9 Dec 2019 12:00:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97A232077B 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 1D17C6E438; Mon, 9 Dec 2019 12:00:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2D3AD6E42D; Mon, 9 Dec 2019 12:00:27 +0000 (UTC) Received: by mail-wr1-x42c.google.com with SMTP id y11so15865358wrt.6; Mon, 09 Dec 2019 04:00:27 -0800 (PST) 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=hRybqVavQHo4kc2uAW1DufA56ffoS4VWZ8W5YOU7UtQ=; b=MlLo03XAUfHtDoREKWu+JqM3vLuC7wSPcqIpGLHefmUHLhw7z40JARHjh307or0By2 +WaAHJ/OOAo7pUrJbxRTnIaLMNPM2rhFtXbXBSEcuMInLyzjPZImrU2mpuw5fI0xltbW elv/JdD/9WqHFb8aGbVAHUQtygNAXdUwZhn/K8QTS5OwquWJ0IeAlJX3rlX8vMhCO1mA /hfpsj39Lze82oBzfJtU/dRZ1IiJLTkKDhfG85JEmKmEHsvxvR/Ck37isWsnKsahPB4M 5V4gPDurtXFX5WFjHVU/WUHmmWQnFtgGsTNOEKf1ghfBIGJKYB9BkcJN1OIRVKZiN5ye psPg== X-Gm-Message-State: APjAAAXaOsMBcHRyvd7W5rbVOBqbnd7daf5b2nr3WJUFn/mn7yrpp/Hi aZOA4rQ3fJBC9+ZGG92OC2jTd2dA X-Google-Smtp-Source: APXvYqwGAStGmh5k52u0RoRw/k32jrc4q5lTbFOStWvlY73rNHM4OXu04y09xn3OYGOx3B/rw9LKUQ== X-Received: by 2002:adf:b64b:: with SMTP id i11mr1683353wre.58.1575892825514; Mon, 09 Dec 2019 04:00:25 -0800 (PST) Received: from localhost (pD9E518ED.dip0.t-ipconnect.de. [217.229.24.237]) by smtp.gmail.com with ESMTPSA id j12sm28417673wrw.54.2019.12.09.04.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 04:00:24 -0800 (PST) From: Thierry Reding To: Ben Skeggs Subject: [PATCH v3 9/9] drm/nouveau: gp10b: Use correct copy engine Date: Mon, 9 Dec 2019 13:00:05 +0100 Message-Id: <20191209120005.2254786-10-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191209120005.2254786-1-thierry.reding@gmail.com> References: <20191209120005.2254786-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=hRybqVavQHo4kc2uAW1DufA56ffoS4VWZ8W5YOU7UtQ=; b=I3rxL24mYZqpFkBuF0tA7G5UTw3tF0TJkYyIYt79Hs3jpj9RpazUzevgJhnVEPKQrh SkR9egT7lgk6iOKwB4F5YgqkRiZL8tgmuul/LmLv9/k5dvjGfQ19vPp+7Mj0ab+AHBCb q+Qwh0vTVVvKQpz3s2qs2QZP5vpJol4KgOOPaO7aLPI0YfW5KcTzoLPQSyq/JEWVFNv6 La0nReZlcssGJkW63OAHHdQlUsFsf5f7e5QVSOEVpm73s8AQpr6sSB12JJD1DpWyyHjw 9zIoC1imvNgbczStN+jV6BlS9BHpOdl4TSrBrKebUIEBF0wrPJ5NOi3ldvjaU2Gn0Q8n 8eyg== 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 231ec0073af3..eba450e689b2 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,