From patchwork Sun Jun 10 11:01:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Chauvet X-Patchwork-Id: 927332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nrf3QWlr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 413Y9y3ZgDz9rxs for ; Sun, 10 Jun 2018 21:01:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753864AbeFJLBl (ORCPT ); Sun, 10 Jun 2018 07:01:41 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:45843 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbeFJLBk (ORCPT ); Sun, 10 Jun 2018 07:01:40 -0400 Received: by mail-wr0-f194.google.com with SMTP id o12-v6so17426377wrm.12 for ; Sun, 10 Jun 2018 04:01:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9eoHlmSa8krWWO1u5Z8NE0eRt9a8Dr5dz/FmXV2B/Iw=; b=nrf3QWlraQAY2UELkQCQGCXDkTzi+aruMVIMfDNIctEbVfS3cre64hnO9F4JsadQHW Fj0CdHpbSnk7fEJGXDqHOXqj+WljAa4TpWoPkzsEptie/N3AWMmXzMAmPubdt5dRkUGJ nw1+oADb77oR0qh3vl6xtoBAaFsMrxJYTisghkdB6jwf4jrY8lXTQajSP9Xn8SvhfWYP MZjYERlwdnuUCM2Oerkk0W8fuVT68QDwmNGQqZtjO5O/0iFf3Jjctu5hqs5kB1rETRkB +9mmfWoqOP2GOK2t9SbfaZcfgUA5Jgg5g3CZsFfWeXl08egHYCbANs8SBCEOopGw/9Cq vPAA== 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; bh=9eoHlmSa8krWWO1u5Z8NE0eRt9a8Dr5dz/FmXV2B/Iw=; b=lgdUy63un+6dEURPDpjzC9zzE0RtLEGHB1A0YlLmIxxXVQPzOfaeTBm4AUGqivqJa3 Nf/VSJtbZrqqnmJSpGi3btAOa7os174KlUuN7fNGTW41YbeEwzv5rdvDyH/UTu3V1TJ0 wfFscqdV4EK23QC8HID+jnLIC4fH9yd+aNhF3tREUcaKnSmQJB5Rt/Iae+mUBfjTp4hX 2WwFaIxu/jZEGPOSDfIvA/A+euU+9vukIKocsnpasSdUS1cRm1kphbvoIASVb6guNU0i AjKMdKUA+nLaUPbrPmzaR2v34CE2KVqSTnIjYG23aXKOdKFzytPtZdfj0MHGr1c6B0PJ z2vQ== X-Gm-Message-State: APt69E0Gg8hgEc9B3xftdASVzg54+2aLfrTYfFYiH/1tfqzSmELQ9GHh /bClwLhkO50WldHRukp0bf4= X-Google-Smtp-Source: ADUXVKJK81zDJJVNWHN+yLGS1xNuf8kFxBpqrCQJusVaos+234poUkQM25dd3iOgBxDXQNykvTelGw== X-Received: by 2002:adf:eb0c:: with SMTP id s12-v6mr7626572wrn.174.1528628499127; Sun, 10 Jun 2018 04:01:39 -0700 (PDT) Received: from arrakis.kwizart.net (LFbn-NIC-1-209-167.w2-15.abo.wanadoo.fr. [2.15.56.167]) by smtp.gmail.com with ESMTPSA id e63-v6sm7149086wma.46.2018.06.10.04.01.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Jun 2018 04:01:38 -0700 (PDT) From: Nicolas Chauvet To: nouveau@lists.freedesktop.org, thierry.reding@gmail.com Cc: linux-tegra@vger.kernel.org, mperttunen@nvidia.com, Nicolas Chauvet Subject: [PATCH] drm: nouveau: Enable gp20b/gp10b firmware tag when relevant Date: Sun, 10 Jun 2018 13:01:31 +0200 Message-Id: <20180610110131.10490-1-kwizart@gmail.com> X-Mailer: git-send-email 2.13.6 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org This allows to have the related MODULE_FIRMWARE tag only on relevant arch (arm64). This will saves about 400k on initramfs when not relevant Signed-off-by: Nicolas Chauvet Acked-by: Thierry Reding --- drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 2 ++ drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c index 30491d132d59..df8b919dcf09 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c @@ -129,6 +129,7 @@ gm20b_secboot_new(struct nvkm_device *device, int index, return 0; } +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) MODULE_FIRMWARE("nvidia/gm20b/acr/bl.bin"); MODULE_FIRMWARE("nvidia/gm20b/acr/ucode_load.bin"); MODULE_FIRMWARE("nvidia/gm20b/gr/fecs_bl.bin"); @@ -144,3 +145,4 @@ MODULE_FIRMWARE("nvidia/gm20b/gr/sw_method_init.bin"); MODULE_FIRMWARE("nvidia/gm20b/pmu/desc.bin"); MODULE_FIRMWARE("nvidia/gm20b/pmu/image.bin"); MODULE_FIRMWARE("nvidia/gm20b/pmu/sig.bin"); +#endif diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c index 632e9545e292..28ca29d0eeee 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.c @@ -74,6 +74,7 @@ gp10b_secboot_new(struct nvkm_device *device, int index, return 0; } +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) MODULE_FIRMWARE("nvidia/gp10b/acr/bl.bin"); MODULE_FIRMWARE("nvidia/gp10b/acr/ucode_load.bin"); MODULE_FIRMWARE("nvidia/gp10b/gr/fecs_bl.bin"); @@ -91,3 +92,4 @@ MODULE_FIRMWARE("nvidia/gp10b/gr/sw_method_init.bin"); MODULE_FIRMWARE("nvidia/gp10b/pmu/desc.bin"); MODULE_FIRMWARE("nvidia/gp10b/pmu/image.bin"); MODULE_FIRMWARE("nvidia/gp10b/pmu/sig.bin"); +#endif