From patchwork Fri Nov 23 12:31:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1002285 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AEsD32ZF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 431bKJ0ySNz9s8J for ; Fri, 23 Nov 2018 23:31:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504288AbeKWXPr (ORCPT ); Fri, 23 Nov 2018 18:15:47 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44609 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504317AbeKWXPr (ORCPT ); Fri, 23 Nov 2018 18:15:47 -0500 Received: by mail-ed1-f66.google.com with SMTP id y56so10114414edd.11 for ; Fri, 23 Nov 2018 04:31:45 -0800 (PST) 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=uoqQqNzjrq/UJegaB/x+JXO0modRKIbdCQ+CP1fkfdg=; b=AEsD32ZF5M0HaDCXUMTrdPNXx6MvTGv8RBTBsMn2dyn5L7Jf5G6HO0HDQ3MH0ynwF/ 1l2JxxbZ8kgkQn3Hv6kCO4bJqvclbvS5y0DqRopSSbFao0IOM1jLcu1+Vd/PEf4fRpAU bJ+ic36w25R6dlqBKdfqO2PgTrP+SfdGfUuf+Qw9Jmjbg4L62pR9hF/nf2ij3a16WMh/ 7LPVzHj81j2P250Bn2i4WjHl3btJ7aRnqFYDZzChkYtn7fm45q5kJl0UhgwvVypsILtt He3j1mveHftYe0rSRGr0+zZW7U5LQnTw2jhwaaoZVE2T6372U0UxA9tYy2Tb8+tMKdPM vZNg== 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=uoqQqNzjrq/UJegaB/x+JXO0modRKIbdCQ+CP1fkfdg=; b=a5nC72o30/mcadA6y/fcxBHF5m29+LQXgnNQk+kkR3FrDm5AUefRj1PC9nWA9UW66o ruGUym8AgZ07WPDR9Rk8HeO3sY/GDeBk4VYM0+exzlw93RhMS+6ma5y+fyqQKDPGHuyg TCLXRrCyWDF9059USeiGLNVCF7GrcIjvUe1/k/oSJbfxQB4R4VWLLXC2fES72CUvkguu uDA2VGbelhxXKSGebVvRIeRn/J02wv5MRPETAR7HXDsqX6Kx3XB5JwzodA9l76G0gZvj Co2orWhk62oPiep6UqJt7W4auN1o2wWouQ5L/EFHZJVF7nGN2IIMh9M2K9Jft6kbMUsl tCRw== X-Gm-Message-State: AA+aEWZzXVAbTY2ka6QY29cRf2zqXv3KBQ7wfxDJ3/B1N9MF1K9M6sjT szdCNQHNmrFZ9+41r+Gu63c= X-Google-Smtp-Source: AFSGD/VgQl7iaqPSgPiDAKrJwDGLPUHFr+5x9cHQFZpD5TPAxAC3ynxWk8nm1c3pg4RmsJ36KaPzvg== X-Received: by 2002:a50:8907:: with SMTP id e7mr13192310ede.252.1542976304514; Fri, 23 Nov 2018 04:31:44 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id n29sm11448157edd.40.2018.11.23.04.31.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Nov 2018 04:31:43 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Jon Hunter , Mikko Perttunen , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 4/7] drm/tegra: vic: Add Tegra194 support Date: Fri, 23 Nov 2018 13:31:35 +0100 Message-Id: <20181123123138.20739-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123123138.20739-1-thierry.reding@gmail.com> References: <20181123123138.20739-1-thierry.reding@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding The Video Image Composer (VIC) generation found on Tegra194 is the same as its predecessor found on Tegra186. Signed-off-by: Thierry Reding Reviewed-by: Mikko Perttunen --- drivers/gpu/drm/tegra/drm.c | 1 + drivers/gpu/drm/tegra/vic.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 65ea4988b332..4b70ce664c41 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1274,6 +1274,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { { .compatible = "nvidia,tegra194-display", }, { .compatible = "nvidia,tegra194-dc", }, { .compatible = "nvidia,tegra194-sor", }, + { .compatible = "nvidia,tegra194-vic", }, { /* sentinel */ } }; diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 9f657a63b0bb..94dd85c38e39 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -282,10 +282,18 @@ static const struct vic_config vic_t186_config = { .version = 0x18, }; +#define NVIDIA_TEGRA_194_VIC_FIRMWARE "nvidia/tegra194/vic.bin" + +static const struct vic_config vic_t194_config = { + .firmware = NVIDIA_TEGRA_194_VIC_FIRMWARE, + .version = 0x19, +}; + static const struct of_device_id vic_match[] = { { .compatible = "nvidia,tegra124-vic", .data = &vic_t124_config }, { .compatible = "nvidia,tegra210-vic", .data = &vic_t210_config }, { .compatible = "nvidia,tegra186-vic", .data = &vic_t186_config }, + { .compatible = "nvidia,tegra194-vic", .data = &vic_t194_config }, { }, }; @@ -418,3 +426,6 @@ MODULE_FIRMWARE(NVIDIA_TEGRA_210_VIC_FIRMWARE); #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) MODULE_FIRMWARE(NVIDIA_TEGRA_186_VIC_FIRMWARE); #endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) +MODULE_FIRMWARE(NVIDIA_TEGRA_194_VIC_FIRMWARE); +#endif