2 files changed, 18 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/Kconfig b/drivers/gpu/nvgpu/Kconfig
index 160ec8be..238d87e2 100644
--- a/drivers/gpu/nvgpu/Kconfig
+++ b/drivers/gpu/nvgpu/Kconfig
@@ -1,5 +1,6 @@
 config GK20A
-        bool "Nvidia GK20A GPU support"
+        tristate "Nvidia GK20A GPU support"
+        default y
         help
           Choose this option if you have an SoC with integrated
           Nvidia GPU IP.
@@ -54,7 +55,18 @@ config GK20A_CYCLE_STATS
 
 config GK20A_PHYS_PAGE_TABLES
         bool "Use physical addressing for gk20a page tables"
+        depends on GK20A
         default y if TEGRA_SIMULATION_PLATFORM
         help
           Use physical addressing for gk20a page tables. If this is off, we
           use SMMU translation.
+
+config TEGRA_GK20A
+        bool "Enable the GK20A GPU on Tegra"
+        depends on TEGRA_GRHOST
+        depends on 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).
diff --git a/drivers/gpu/nvgpu/gk20a/Makefile b/drivers/gpu/nvgpu/gk20a/Makefile
index f9b06b72..cba31681 100644
--- a/drivers/gpu/nvgpu/gk20a/Makefile
+++ b/drivers/gpu/nvgpu/gk20a/Makefile
@@ -4,7 +4,7 @@ ccflags-y += -Idrivers/devfreq
 ccflags-y += -Wno-multichar
 ccflags-y += -Werror
 
-obj-$(CONFIG_GK20A) += \
+nvgpu-y := \
         gk20a.o \
         as_gk20a.o \
         ctrl_gk20a.o \
@@ -30,7 +30,8 @@ obj-$(CONFIG_GK20A) += \
         fb_gk20a.o \
         hal.o \
         hal_gk20a.o \
-        gk20a_allocator.o
+        gk20a_allocator.o \
+        platform_gk20a_generic.o
+nvgpu-$(CONFIG_TEGRA_GK20A) += platform_gk20a_tegra.o
 
-obj-$(CONFIG_GK20A) += platform_gk20a_generic.o
-obj-$(CONFIG_TEGRA_GK20A) += platform_gk20a_tegra.o
+obj-$(CONFIG_GK20A) := nvgpu.o