From b2d8c4774f3162e2c82b2eddfa47439373d53772 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Thu, 12 Sep 2019 11:58:21 +0530 Subject: [PATCH] gpu: nvgpu: disable KMDKickoff for safety build Disable KMDKickoff for safety builds. Jira NVPU-3172 Change-Id: I96536066e5bae83179750d4bf15f77e115219ddd Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/2142917 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.shared.configs | 24 +++++++++++----------- drivers/gpu/nvgpu/libnvgpu-drv_safe.export | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs index 191ce253d..98afd2faf 100644 --- a/drivers/gpu/nvgpu/Makefile.shared.configs +++ b/drivers/gpu/nvgpu/Makefile.shared.configs @@ -61,18 +61,6 @@ NVGPU_COMMON_CFLAGS += \ -DCONFIG_TEGRA_GR_VIRTUALIZATION \ -DCONFIG_PCI_MSI -# Enable Channel WDT for safety build until we switch to user mode submits only -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_WDT - -# Enable Kernel Mode submit for safety build until we switch to user mode -# submits only -CONFIG_NVGPU_KERNEL_MODE_SUBMIT := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_KERNEL_MODE_SUBMIT - -# Enable fences for safety build till until we switch to user mode submits only -CONFIG_NVGPU_FENCE := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FENCE - CONFIG_NVGPU_LOGGING := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_LOGGING @@ -185,6 +173,18 @@ NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_SET_FALCON_ACCESS_MAP CONFIG_NVGPU_SW_SEMAPHORE := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_SW_SEMAPHORE +# Enable Channel WDT for safety build until we switch to user mode submits only +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CHANNEL_WDT + +# Enable Kernel Mode submit for safety build until we switch to user mode +# submits only +CONFIG_NVGPU_KERNEL_MODE_SUBMIT := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_KERNEL_MODE_SUBMIT + +# Enable fences for safety build till until we switch to user mode submits only +CONFIG_NVGPU_FENCE := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_FENCE + # Enable powergate lib for normal build CONFIG_NVGPU_USE_POWERGATE_LIB := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_USE_POWERGATE_LIB diff --git a/drivers/gpu/nvgpu/libnvgpu-drv_safe.export b/drivers/gpu/nvgpu/libnvgpu-drv_safe.export index 705c90f58..b70342109 100644 --- a/drivers/gpu/nvgpu/libnvgpu-drv_safe.export +++ b/drivers/gpu/nvgpu/libnvgpu-drv_safe.export @@ -292,7 +292,6 @@ nvgpu_thread_should_stop nvgpu_thread_stop nvgpu_thread_stop_graceful nvgpu_udelay -nvgpu_userd_init_slabs nvgpu_usermode_writel nvgpu_usleep_range nvgpu_vfree_impl