diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-03 17:28:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-03 17:28:41 -0800 |
| commit | 1903de7777c001aa4eba37d4eace9f538cf511cd (patch) | |
| tree | e979a41916fe79ab1b27803a4d1cb603559c0e44 /arch | |
| parent | fcdc4372243672ab06725102f83c7bb8d288b797 (diff) | |
| parent | 480bb31f4286d838fc0eebcfd813dd83236406e7 (diff) | |
| download | linux-stable-1903de7777c001aa4eba37d4eace9f538cf511cd.tar.gz linux-stable-1903de7777c001aa4eba37d4eace9f538cf511cd.tar.bz2 linux-stable-1903de7777c001aa4eba37d4eace9f538cf511cd.zip | |
Merge tag 'tegra-for-5.5-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
ARM: tegra: Default configuration changes for v5.5-rc1
Enables the Tegra VDE driver by default. This is currently in staging
but can be used with existing userspace to do hardware-accelerated video
decoding of H.264 streams.
* tag 'tegra-for-5.5-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Enable Tegra VDE driver in tegra_defconfig
Link: https://lore.kernel.org/r/20191102144521.3863321-7-thierry.reding@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 8f5c6a5b444c..a27592d3b1fa 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -250,6 +250,8 @@ CONFIG_KEYBOARD_NVEC=y CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y +CONFIG_STAGING_MEDIA=y +CONFIG_TEGRA_VDE=y CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_ARCH_TEGRA_2x_SOC=y |