From 825381b4aef06c0e8a3fde7aba223e6f84536b9c Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Fri, 13 Sep 2019 11:33:30 -0400 Subject: [PATCH] gpu: nvgpu: disable recovery for safety build Disable CONFIG_NVGPU_RECOVERY for safety build. Uncorrectable errors will cause the GPU to be put gracefully into a non-functioning state to ensure that no corrupted work is completed because of the fault. This is because the freedom from interference may not always be shown between the faulted and the non-faulted TSG contexts. Jira NVGPU-4089 Change-Id: Ice60722a3be3df980ac81c26f1370f22192bab36 Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/2197255 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Nibade GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.shared.configs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs index 1fbb4dbfb..778ca21dd 100644 --- a/drivers/gpu/nvgpu/Makefile.shared.configs +++ b/drivers/gpu/nvgpu/Makefile.shared.configs @@ -64,10 +64,6 @@ NVGPU_COMMON_CFLAGS += \ CONFIG_NVGPU_LOGGING := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_LOGGING -# Enable recovery for safety build until sw quiesce is done -CONFIG_NVGPU_RECOVERY := 1 -NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_RECOVERY - ifeq ($(profile),$(filter $(profile),safety_debug safety_release)) # Enable golden context verification only for safety debug/release build @@ -103,6 +99,9 @@ NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_ENGINE_QUEUE CONFIG_NVGPU_DEBUGGER := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_DEBUGGER +CONFIG_NVGPU_RECOVERY := 1 +NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_RECOVERY + CONFIG_NVGPU_CILP := 1 NVGPU_COMMON_CFLAGS += -DCONFIG_NVGPU_CILP