| Message ID | 20181123123138.20739-4-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/7] gpu: host1x: Resize channel register region on Tegra186 and later | expand |
On 23.11.2018 14:31, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > The Video Image Composer (VIC) generation found on Tegra194 is the same > as its predecessor found on Tegra186. It is not the same, but like with Host1x itself the changes are not visible here. With that fixed, Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com> > > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > 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 >
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