Commit d6b9bc02 authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: vic: Add Tegra194 support 



The Video Image Composer (VIC) generation found on Tegra194 is backwards
compatible with its predecessor found on Tegra186.

Reviewed-by: default avatarMikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent ac1bdbf2

drivers/gpu/drm/tegra/drm.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */ }

};

drivers/gpu/drm/tegra/vic.c

+11 −0
Original line number Diff line number Diff line
@@ -307,10 +307,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 },

	{ },

};
@@ -451,3 +459,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