From 46764de3ac2ae1a11e4f832e1898626afd6ca23c Mon Sep 17 00:00:00 2001
From: Thomas Fleury <tfleury@nvidia.com>
Date: Fri, 29 Mar 2019 15:33:47 -0700
Subject: [PATCH] gpu: nvgpu: enable NVGPU_USERD for safety build

Enable NVGPU_USERD for safety build until we switch to user mode
submit only.

Jira NVGPU-2713

Change-Id: Ie5e3400448419bb5fc0c04ef5a16f5123d30cb6d
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2085400
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/Makefile.tmk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/nvgpu/Makefile.tmk b/drivers/gpu/nvgpu/Makefile.tmk
index 6e318dc20..0fc96f1b4 100644
--- a/drivers/gpu/nvgpu/Makefile.tmk
+++ b/drivers/gpu/nvgpu/Makefile.tmk
@@ -72,6 +72,9 @@ NV_COMPONENT_CFLAGS             += -DNVGPU_USERD
 # Support iGPU Virt for normal builds
 IGPU_VIRT_SUPPORT              := 1
 NV_COMPONENT_CFLAGS            += -DIGPU_VIRT_SUPPORT
+else
+# Enable USERD until we switch to user mode submit only
+NV_COMPONENT_CFLAGS             += -DNVGPU_USERD
 endif
 
 _NV_TOOLCHAIN_CFLAGS            += -rdynamic -g