Commit 9550669c authored by Mikko Perttunen's avatar Mikko Perttunen Committed by Thierry Reding
Browse files

drm/tegra: vic: Add Tegra234 support 



Add Tegra234 support for VIC. It is backwards compatible with
Tegra194.

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

drivers/gpu/drm/tegra/drm.c

+1 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { 
	{ .compatible = "nvidia,tegra194-sor", },

	{ .compatible = "nvidia,tegra194-vic", },

	{ .compatible = "nvidia,tegra194-nvdec", },

	{ .compatible = "nvidia,tegra234-vic", },

	{ /* sentinel */ }

};

drivers/gpu/drm/tegra/vic.c

+12 −0
Original line number Diff line number Diff line
@@ -447,11 +447,20 @@ static const struct vic_config vic_t194_config = { 
	.supports_sid = true,

};



#define NVIDIA_TEGRA_234_VIC_FIRMWARE "nvidia/tegra234/vic.bin"



static const struct vic_config vic_t234_config = {

	.firmware = NVIDIA_TEGRA_234_VIC_FIRMWARE,

	.version = 0x23,

	.supports_sid = true,

};



static const struct of_device_id tegra_vic_of_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 },

	{ .compatible = "nvidia,tegra234-vic", .data = &vic_t234_config },

	{ },

};

MODULE_DEVICE_TABLE(of, tegra_vic_of_match);
@@ -590,3 +599,6 @@ MODULE_FIRMWARE(NVIDIA_TEGRA_186_VIC_FIRMWARE); 
#if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC)

MODULE_FIRMWARE(NVIDIA_TEGRA_194_VIC_FIRMWARE);

#endif

#if IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC)

MODULE_FIRMWARE(NVIDIA_TEGRA_234_VIC_FIRMWARE);

#endif