diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/Kconfig | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/Makefile | 9 |
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 @@ | |||
1 | config GK20A | 1 | config GK20A |
2 | bool "Nvidia GK20A GPU support" | 2 | tristate "Nvidia GK20A GPU support" |
3 | default y | ||
3 | help | 4 | help |
4 | Choose this option if you have an SoC with integrated | 5 | Choose this option if you have an SoC with integrated |
5 | Nvidia GPU IP. | 6 | Nvidia GPU IP. |
@@ -54,7 +55,18 @@ config GK20A_CYCLE_STATS | |||
54 | 55 | ||
55 | config GK20A_PHYS_PAGE_TABLES | 56 | config GK20A_PHYS_PAGE_TABLES |
56 | bool "Use physical addressing for gk20a page tables" | 57 | bool "Use physical addressing for gk20a page tables" |
58 | depends on GK20A | ||
57 | default y if TEGRA_SIMULATION_PLATFORM | 59 | default y if TEGRA_SIMULATION_PLATFORM |
58 | help | 60 | help |
59 | Use physical addressing for gk20a page tables. If this is off, we | 61 | Use physical addressing for gk20a page tables. If this is off, we |
60 | use SMMU translation. | 62 | use SMMU translation. |
63 | |||
64 | config TEGRA_GK20A | ||
65 | bool "Enable the GK20A GPU on Tegra" | ||
66 | depends on TEGRA_GRHOST | ||
67 | depends on GK20A | ||
68 | default y | ||
69 | help | ||
70 | Enable support for the GK20A graphics engine on Tegra | ||
71 | by adding a Tegra platfrom interface to the GK20A driver. | ||
72 | 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 | |||
4 | ccflags-y += -Wno-multichar | 4 | ccflags-y += -Wno-multichar |
5 | ccflags-y += -Werror | 5 | ccflags-y += -Werror |
6 | 6 | ||
7 | obj-$(CONFIG_GK20A) += \ | 7 | nvgpu-y := \ |
8 | gk20a.o \ | 8 | gk20a.o \ |
9 | as_gk20a.o \ | 9 | as_gk20a.o \ |
10 | ctrl_gk20a.o \ | 10 | ctrl_gk20a.o \ |
@@ -30,7 +30,8 @@ obj-$(CONFIG_GK20A) += \ | |||
30 | fb_gk20a.o \ | 30 | fb_gk20a.o \ |
31 | hal.o \ | 31 | hal.o \ |
32 | hal_gk20a.o \ | 32 | hal_gk20a.o \ |
33 | gk20a_allocator.o | 33 | gk20a_allocator.o \ |
34 | platform_gk20a_generic.o | ||
35 | nvgpu-$(CONFIG_TEGRA_GK20A) += platform_gk20a_tegra.o | ||
34 | 36 | ||
35 | obj-$(CONFIG_GK20A) += platform_gk20a_generic.o | 37 | obj-$(CONFIG_GK20A) := nvgpu.o |
36 | obj-$(CONFIG_TEGRA_GK20A) += platform_gk20a_tegra.o | ||