drm/tegra: Set MODULE_FIRMWARE for the VIC
authorNicolas Chauvet <kwizart@gmail.com>
Tue, 11 Jul 2017 08:39:04 +0000 (10:39 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 17 Aug 2017 15:57:09 +0000 (17:57 +0200)
The defines are set anyway to prevent an empty string. The test for the
SoC is the same as for Nouveau for the Tegra GPU firmware (see
drivers/gpu/drm/nouveau/nouveau_platform.c)

v2:
 - Place the defines above each chip's vic_config struct
 - MODULE_FIRMWARE() at the end of the file

Fixes: 0ae797a8ba05 ("drm/tegra: Add VIC support")
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/vic.c

index 47cb1aaa58b17731c620b31958bf5a5b094d5665..2448229fa653b2b226fd6e9decb90f873dd10eed 100644 (file)
@@ -258,12 +258,16 @@ static const struct tegra_drm_client_ops vic_ops = {
        .submit = tegra_drm_submit,
 };
 
+#define NVIDIA_TEGRA_124_VIC_FIRMWARE "nvidia/tegra124/vic03_ucode.bin"
+
 static const struct vic_config vic_t124_config = {
-       .firmware = "nvidia/tegra124/vic03_ucode.bin",
+       .firmware = NVIDIA_TEGRA_124_VIC_FIRMWARE,
 };
 
+#define NVIDIA_TEGRA_210_VIC_FIRMWARE "nvidia/tegra210/vic04_ucode.bin"
+
 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[] = {
@@ -394,3 +398,10 @@ struct platform_driver tegra_vic_driver = {
        .probe = vic_probe,
        .remove = vic_remove,
 };
+
+#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