From 7b035d2befd094c20f324d28721828e2fe5519fb Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Mon, 12 Aug 2019 17:22:49 +0530 Subject: [PATCH] gpu: nvgpu: disable debugger and CILP support in safety Compile out debugger and CILP support from safety build Jira NVGPU-3579 Change-Id: Ib8a880190ebcce946f8fb94ddb63dd2a90c5fce9 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/2126444 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.shared.configs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs index f621ba4c6..54170c5e5 100644 --- a/drivers/gpu/nvgpu/Makefile.shared.configs +++ b/drivers/gpu/nvgpu/Makefile.shared.configs @@ -61,14 +61,6 @@ NVGPU_COMMON_CFLAGS += \ -DCONFIG_TEGRA_GR_VIRTUALIZATION \ -DCONFIG_PCI_MSI -# Enable debugger APIs for safety build until devctl whitelisting is done -CONFIG_NVGPU_DEBUGGER := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_DEBUGGER - -# Enable CILP preemption for safety build until devctl whitelisting is done -CONFIG_NVGPU_CILP := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CILP - # Enable Channel WDT for safety build until we switch to user mode submits only NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_WDT @@ -130,6 +122,12 @@ NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_ACR_LEGACY CONFIG_NVGPU_ENGINE_QUEUE := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_ENGINE_QUEUE +CONFIG_NVGPU_DEBUGGER := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_DEBUGGER + +CONFIG_NVGPU_CILP := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CILP + CONFIG_NVGPU_CYCLESTATS := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CYCLESTATS