From 662c441467c4f251d65840f2097ac4e58ec234ff Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 24 Jan 2018 12:42:57 -0800 Subject: gpu: nvgpu: Allow disabling CDE functionality CDE is a Tegra SoC specific feature. Add new config option CONFIG_NVGPU_SUPPORT_CDE and #ifdef all CDE specific code with it. JIRA NVGPU-4 Change-Id: I6f0b0047d6ba2b5c36c2eb9b8a1514776741f5b5 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1648002 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile') diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index c99a48dc..4169bc9b 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -38,12 +38,9 @@ nvgpu-y := \ common/linux/vm.o \ common/linux/intr.o \ common/linux/sysfs.o \ - common/linux/cde.o \ common/linux/io.o \ common/linux/io_usermode.o \ common/linux/rwsem.o \ - common/linux/cde_gm20b.o \ - common/linux/cde_gp10b.o \ common/linux/comptags.o \ common/linux/dmabuf.o \ common/linux/sched.o \ @@ -132,7 +129,6 @@ nvgpu-$(CONFIG_DEBUG_FS) += \ common/linux/debug.o \ common/linux/debug_gr.o \ common/linux/debug_fifo.o \ - common/linux/debug_cde.o \ common/linux/debug_ce.o \ common/linux/debug_pmu.o \ common/linux/debug_sched.o \ @@ -301,3 +297,13 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ common/linux/vgpu/gv11b/vgpu_fifo_gv11b.o \ common/linux/vgpu/gv11b/vgpu_subctx_gv11b.o \ common/linux/vgpu/gv11b/vgpu_tsg_gv11b.o + +nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ + common/linux/cde.o \ + common/linux/cde_gm20b.o \ + common/linux/cde_gp10b.o + +ifeq ($(CONFIG_DEBUG_FS),y) +nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ + common/linux/debug_cde.o +endif -- cgit v1.2.2