summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLauri Peltonen <lpeltonen@nvidia.com>2014-03-12 18:44:55 +0200
committerSeema Khowala <seemaj@nvidia.com>2014-04-23 14:07:31 -0700
commit05bbcad2a5bfdc08ee2f4d4e0bc69bc2fbbe74c6 (patch)
treee330297a0526482330f27117ef1c0b5fc4d80496 /arch/arm
parent0201603a18435d2b4e1df25e2892202588e8f8c4 (diff)
gpu: nvgpu: Allow module build
This patch makes the necessary modifications to the gk20a driver to allow building it as a module. Bug 1476801 Change-Id: I88c4e1c1867baa1c2d010ac6e0c30bdb5fd63b91 Signed-off-by: Lauri Peltonen <lpeltonen@nvidia.com> Reviewed-on: http://git-master/r/380970 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/tegra_ardbeg_mods_defconfig2
-rw-r--r--arch/arm/mach-tegra/Kconfig11
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/configs/tegra_ardbeg_mods_defconfig b/arch/arm/configs/tegra_ardbeg_mods_defconfig
index 8587f058e1a6..2bd35adee658 100644
--- a/arch/arm/configs/tegra_ardbeg_mods_defconfig
+++ b/arch/arm/configs/tegra_ardbeg_mods_defconfig
@@ -29,7 +29,6 @@ CONFIG_MACH_LOKI=y
CONFIG_MACH_LAGUNA=y
CONFIG_TEGRA_EMC_SCALING_ENABLE=y
# CONFIG_TEGRA_GPU_DVFS is not set
-# CONFIG_TEGRA_GK20A is not set
CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
CONFIG_TEGRA_CLOCK_DEBUG_FUNC=y
CONFIG_TEGRA_EDP_LIMITS=y
@@ -317,6 +316,7 @@ CONFIG_EXTCON_MAX77665=y
CONFIG_IIO=y
CONFIG_PWM=y
CONFIG_PWM_TEGRA=y
+# CONFIG_GK20A is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 683269fe8c7a..fa6a1921666c 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -451,17 +451,6 @@ config TEGRA_DVFS_RAIL_CONNECT_ALL
if you want to enable voltage scaling only when all the rails matched
by dvfs connect successfully to the system
-config TEGRA_GK20A
- bool "Enable the GK20A GPU on Tegra"
- depends on ARCH_TEGRA_12x_SOC
- depends on TEGRA_GRHOST
- select GK20A
- default y
- help
- Enable support for the GK20A graphics engine on Tegra
- by adding a Tegra platfrom interface to the GK20A driver.
- The Tegra platform interface requires TEGRA_GRHOST (host1x).
-
config TEGRA_AVP_KERNEL_ON_MMU
bool "Use AVP MMU to relocate AVP kernel"
depends on ARCH_TEGRA_2x_SOC