From 846403c045f63c2e8531e4a918cf726ab90a3bd5 Mon Sep 17 00:00:00 2001 From: Aparna Das Date: Wed, 15 May 2019 09:50:00 -0700 Subject: [PATCH] gpu: nvgpu: vgpu: do not support virt for safety build Safety build configuration supports iGPU in passthrough mode only. Jira GVSCI-517 Change-Id: I37f2c7f88fa8b13d9a87380354c61d5390bdc69c Signed-off-by: Aparna Das Reviewed-on: https://git-master.nvidia.com/r/2119614 GVS: Gerrit_Virtual_Submit Reviewed-by: Richard Zhao Reviewed-by: Sagar Kamble Reviewed-by: Vaibhav Kachore Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.shared.configs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs index edb31e643..4f4ac4ace 100644 --- a/drivers/gpu/nvgpu/Makefile.shared.configs +++ b/drivers/gpu/nvgpu/Makefile.shared.configs @@ -25,13 +25,9 @@ # variable NVGPU_COMMON_CFLAGS that needs to be used by the parent Makefile # to update corresponding cflags variable. -# Support iGPU Virt for safety build until rmserver dependency is resolved -IGPU_VIRT_SUPPORT := 1 -NVGPU_COMMON_CFLAGS := -DIGPU_VIRT_SUPPORT - # Enable debugger APIs for safety build until devctl whitelisting is done NVGPU_DEBUGGER := 1 -NVGPU_COMMON_CFLAGS += -DNVGPU_DEBUGGER +NVGPU_COMMON_CFLAGS := -DNVGPU_DEBUGGER # Enable USERD for safety build until we switch to user mode submits only NVGPU_COMMON_CFLAGS += -DNVGPU_USERD @@ -52,4 +48,7 @@ NVGPU_COMMON_CFLAGS += -DNVGPU_DGPU_SUPPORT ifeq ($(NV_BUILD_CONFIGURATION_IS_SAFETY),0) NVGPU_FECS_TRACE_SUPPORT := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_GK20A_CTXSW_TRACE + +IGPU_VIRT_SUPPORT := 1 +NV_COMPONENT_CFLAGS += -DIGPU_VIRT_SUPPORT endif