From: Mikko Perttunen <mperttunen@nvidia.com>
To: thierry.reding@gmail.com, jonathanh@nvidia.com,
robh+dt@kernel.org, mark.rutland@arm.com
Cc: digetx@gmail.com, amerilainen@nvidia.com, dnibade@nvidia.com,
sgurrappadi@nvidia.com, dri-devel@lists.freedesktop.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
Mikko Perttunen <mperttunen@nvidia.com>
Subject: [PATCH v2 6/6] drm/tegra: Add Tegra186 support for VIC
Date: Tue, 5 Sep 2017 11:43:06 +0300 [thread overview]
Message-ID: <20170905084306.19318-7-mperttunen@nvidia.com> (raw)
In-Reply-To: <20170905084306.19318-1-mperttunen@nvidia.com>
Add Tegra186 support for VIC - no changes are required except for new
firmware and compatibility string.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
---
drivers/gpu/drm/tegra/drm.c | 1 +
drivers/gpu/drm/tegra/vic.c | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 3ba659a5940d..e3331a2bc082 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1281,6 +1281,7 @@ static const struct of_device_id host1x_drm_subdevs[] = {
{ .compatible = "nvidia,tegra210-sor", },
{ .compatible = "nvidia,tegra210-sor1", },
{ .compatible = "nvidia,tegra210-vic", },
+ { .compatible = "nvidia,tegra186-vic", },
{ /* sentinel */ }
};
diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c
index 2448229fa653..6697a21a250d 100644
--- a/drivers/gpu/drm/tegra/vic.c
+++ b/drivers/gpu/drm/tegra/vic.c
@@ -270,9 +270,16 @@ static const struct vic_config vic_t210_config = {
.firmware = NVIDIA_TEGRA_210_VIC_FIRMWARE,
};
+#define NVIDIA_TEGRA_186_VIC_FIRMWARE "nvidia/tegra186/vic04_ucode.bin"
+
+static const struct vic_config vic_t186_config = {
+ .firmware = NVIDIA_TEGRA_186_VIC_FIRMWARE,
+};
+
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 },
{ },
};
@@ -405,3 +412,6 @@ MODULE_FIRMWARE(NVIDIA_TEGRA_124_VIC_FIRMWARE);
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
MODULE_FIRMWARE(NVIDIA_TEGRA_210_VIC_FIRMWARE);
#endif
+#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC)
+MODULE_FIRMWARE(NVIDIA_TEGRA_186_VIC_FIRMWARE);
+#endif
--
2.14.1
next prev parent reply other threads:[~2017-09-05 8:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 8:43 [PATCH v2 0/6] Host1x and VIC support for Tegra186 Mikko Perttunen
2017-09-05 8:43 ` [PATCH v2 1/6] arm64: tegra: Add #power-domain-cells for BPMP Mikko Perttunen
2017-10-19 10:49 ` Thierry Reding
2017-09-05 8:43 ` [PATCH v2 2/6] arm64: tegra: Add host1x on Tegra186 Mikko Perttunen
2017-10-19 10:50 ` Thierry Reding
2017-09-05 8:43 ` [PATCH v2 3/6] arm64: tegra: Add VIC " Mikko Perttunen
2017-10-19 10:50 ` Thierry Reding
2017-09-05 8:43 ` [PATCH v2 4/6] dt-bindings: host1x: Add Tegra186 information Mikko Perttunen
2017-09-12 21:49 ` Rob Herring
2017-10-19 11:39 ` Thierry Reding
2017-09-05 8:43 ` [PATCH v2 5/6] gpu: host1x: Add Tegra186 support Mikko Perttunen
2017-10-19 11:39 ` Thierry Reding
2017-09-05 8:43 ` Mikko Perttunen [this message]
2017-10-19 11:40 ` [PATCH v2 6/6] drm/tegra: Add Tegra186 support for VIC Thierry Reding
2017-09-05 11:10 ` [PATCH v2 0/6] Host1x and VIC support for Tegra186 Daniel Vetter
2017-09-05 11:28 ` Mikko Perttunen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170905084306.19318-7-mperttunen@nvidia.com \
--to=mperttunen@nvidia.com \
--cc=amerilainen@nvidia.com \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=dnibade@nvidia.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sgurrappadi@nvidia.com \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).