From 852c7770b8f45d18e2055813ba374bbfb820b185 Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Thu, 5 Sep 2019 16:33:34 +0530 Subject: [PATCH] gpu: nvgpu: compile out TSG_SCHEDULING and TSG_CONTROL from safety build With channel FORCE_RESET now removed from the whitelist, compile out the sources under CONFIG_NVGPU_TSG_SCHEDULING and CONFIG_NVGPU_TSG_CONTROL for the safety builds. JIRA NVGPU-3655 JIRA NVGPU-3656 Change-Id: I887ac05d485a0f495b7713937d9ed0ffa1e34ba9 Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/2190767 Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.shared.configs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs index 10fb6d806..b8a1b916d 100644 --- a/drivers/gpu/nvgpu/Makefile.shared.configs +++ b/drivers/gpu/nvgpu/Makefile.shared.configs @@ -73,14 +73,6 @@ NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_KERNEL_MODE_SUBMIT CONFIG_NVGPU_FENCE := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FENCE -# Enable Channel/TSG Scheduling for safety build until devctl whitelisting is done -CONFIG_NVGPU_CHANNEL_TSG_SCHEDULING := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_TSG_SCHEDULING - -# Enable Channel/TSG Control for safety build until devctl whitelisting is done -CONFIG_NVGPU_CHANNEL_TSG_CONTROL := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_TSG_CONTROL - CONFIG_NVGPU_LOGGING := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_LOGGING @@ -204,6 +196,14 @@ NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_DYNAMIC_BUSY_IDLE_SUPPORT # Enable HW based error injection support NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_INJECT_HWERR +# Enable Channel/TSG Scheduling +CONFIG_NVGPU_CHANNEL_TSG_SCHEDULING := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_TSG_SCHEDULING + +# Enable Channel/TSG Control +CONFIG_NVGPU_CHANNEL_TSG_CONTROL := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_TSG_CONTROL + endif endif