From de3ad1a94974b08268a485136f04b8e436ef2579 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 28 Jun 2017 14:16:53 -0700 Subject: gpu: nvgpu: Remove securegpccs flag from gpu_ops Replace securegpccs boolean flag in gpu_ops with entry in common flag system. The new common flag is NVGPU_SEC_SECUREGPCCS Jira NVGPU-74 Change-Id: I46430f95063f617531cf0e5aba472051b41f4a9d Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1514060 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 177a7c9f..818949f0 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -369,36 +369,36 @@ int gp10b_init_hal(struct gk20a *g) #ifdef CONFIG_TEGRA_ACR if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { gops->privsecurity = 0; - gops->securegpccs = 0; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); } else if (g->is_virtual) { gops->privsecurity = 1; - gops->securegpccs = 1; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); } else { val = gk20a_readl(g, fuse_opt_priv_sec_en_r()); if (val) { gops->privsecurity = 1; - gops->securegpccs =1; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); } else { gk20a_dbg_info("priv security is disabled in HW"); gops->privsecurity = 0; - gops->securegpccs = 0; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); } } #else if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { gk20a_dbg_info("running simulator with PRIV security disabled"); gops->privsecurity = 0; - gops->securegpccs = 0; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); } else { val = gk20a_readl(g, fuse_opt_priv_sec_en_r()); if (val) { gk20a_dbg_info("priv security is not supported but enabled"); gops->privsecurity = 1; - gops->securegpccs =1; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); return -EPERM; } else { gops->privsecurity = 0; - gops->securegpccs = 0; + __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); } } #endif -- cgit v1.2.2