| Message ID | 20170705211523.17542-1-kwizart@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On 06.07.2017 00:15, Nicolas Chauvet wrote: > 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 <kwizart@gmail.com> > --- > 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 > + > + I'd prefer to have the defines above each chip's vic_config struct definition, and the MODULE_FIRMWARE() part at the end of the file, like MODULE_* macros usually are. With that, Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> > 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[] = { > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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[] = {
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 <kwizart@gmail.com> --- drivers/gpu/drm/tegra/vic.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)