From patchwork Wed Jul 5 21:15:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Chauvet X-Patchwork-Id: 784851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x2tvB3dhsz9s2s for ; Thu, 6 Jul 2017 07:15:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OH0j0Uj0"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752434AbdGEVPa (ORCPT ); Wed, 5 Jul 2017 17:15:30 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33125 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdGEVP3 (ORCPT ); Wed, 5 Jul 2017 17:15:29 -0400 Received: by mail-wr0-f194.google.com with SMTP id x23so322521wrb.0 for ; Wed, 05 Jul 2017 14:15:28 -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=8gHUgVJ+15Nk8i/oyOXwsdwN+LN9TO67Fd00SZ09nq0=; b=OH0j0Uj00wEw7LTR2cufvZaF/pEZqk4cMvhGPidYWj204qjyYLvSLI+8QCCbHomKIW YKOGQaNMbpbD51VYn2HtQXY+VaV5cnc4eH/ajrzEyDr+ea9f3kY4xuqFX9d01tvNdAtE 9Jb1dR1MO+0dZJC3h5DVbfjGJ+BSMl8Ik545fZx22MISN9i37paLJNId+6h8imIrbGUM NH6oJexeoWxxczQCrJMElazBF0wtkIdw6qV/BP+hiCwcudZ/ksZg+COHQsP15EpTBCEb YWy66a3W1fG6Jb2r5cF3cPeZywEhgR9YAhNOUsSH8+75xXn5cZlLgCDpPe1hM6sN4oKT Fc2w== 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=8gHUgVJ+15Nk8i/oyOXwsdwN+LN9TO67Fd00SZ09nq0=; b=GJDBA69Lekg0hVdpPQnbUVmi9V+sfFeXmpaGFCSGp2Wiv1uQY/0C6SeS6A8DeEkuAc 9nCn+5hOFgaOiFBo3+Davj6vANL5HM2WboedbzRlzA/6P9nyko3DbymliPJLZxsS7gvB SiZ+0/O/WE3T9N0qoRJcGs4bHNzsoetvnzWYhm2cU7rpBkNdDdTmOrB+iSMn4VFjQFmO 8DGnS/eQGuSj6RrZe9LCBPwRU+bTzo2Dq4IAw+EXY6bK9wh3iL2xDa2lP8GY70DuxLHn Ew5d4FR3N0VUJC+7xXLAFsuixAwuDAD7TGPsrp3xQ/pQryiGDMo0Nm4drMGxEXRuP8So Xyjw== X-Gm-Message-State: AKS2vOzdCtvnN5D53l0zbdEuqYj96clzdfkyAvAJVYtVo2wrmOiuFUY+ EyleOs6bvajd2w== X-Received: by 10.28.22.6 with SMTP id 6mr34818351wmw.124.1499289327720; Wed, 05 Jul 2017 14:15:27 -0700 (PDT) Received: from arrakis.kwizart.net (AMarseille-657-1-136-105.w109-208.abo.wanadoo.fr. [109.208.91.105]) by smtp.gmail.com with ESMTPSA id 135sm23755004wmr.17.2017.07.05.14.15.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jul 2017 14:15:27 -0700 (PDT) From: Nicolas Chauvet To: amerilainen@nvidia.com, thierry.reding@gmail.com, mperttunen@nvidia.com Cc: linux-tegra@vger.kernel.org, Nicolas Chauvet Subject: [PATCH] arm: drm: tegra: Set MODULE_FIRMWARE for the VIC Date: Wed, 5 Jul 2017 23:15:23 +0200 Message-Id: <20170705211523.17542-1-kwizart@gmail.com> X-Mailer: git-send-email 2.13.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The define is set anyway to prevent an empty string. The test for the soc is same as nouveau for the tegra gpu firmware (see drivers/gpu/drm/nouveau/nouveau_platform.c) Fixes: 0ae797a8ba05 ("drm/tegra: Add VIC support") Signed-off-by: Nicolas Chauvet Reviewed-by: Mikko Perttunen --- drivers/gpu/drm/tegra/vic.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index cd804e404a11..b329c9368b74 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -23,6 +23,17 @@ #include "falcon.h" #include "vic.h" +#define NVIDIA_TEGRA_124_VIC_FIRMWARE "nvidia/tegra124/vic03_ucode.bin" +#define NVIDIA_TEGRA_210_VIC_FIRMWARE "nvidia/tegra210/vic04_ucode.bin" + +#if IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) +MODULE_FIRMWARE(NVIDIA_TEGRA_124_VIC_FIRMWARE); +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) +MODULE_FIRMWARE(NVIDIA_TEGRA_210_VIC_FIRMWARE); +#endif + + struct vic_config { const char *firmware; }; @@ -259,11 +270,11 @@ static const struct tegra_drm_client_ops vic_ops = { }; static const struct vic_config vic_t124_config = { - .firmware = "nvidia/tegra124/vic03_ucode.bin", + .firmware = NVIDIA_TEGRA_124_VIC_FIRMWARE, }; static const struct vic_config vic_t210_config = { - .firmware = "nvidia/tegra210/vic04_ucode.bin", + .firmware = NVIDIA_TEGRA_210_VIC_FIRMWARE, }; static const struct of_device_id vic_match[] = {