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/gk20a/gk20a.h | 1 - drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 17a06099..8728c9a7 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -993,7 +993,6 @@ struct gpu_ops { void (*isr)(struct gk20a *g); } priv_ring; bool privsecurity; - bool securegpccs; }; struct nvgpu_bios_ucode { diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index d0c4dec7..cc57b09f 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -2400,7 +2400,8 @@ static int gr_gk20a_wait_ctxsw_ready(struct gk20a *g) return ret; } - if (g->ops.gr_ctx.use_dma_for_fw_bootstrap || g->ops.securegpccs) + if (g->ops.gr_ctx.use_dma_for_fw_bootstrap || + nvgpu_is_enabled(g, NVGPU_SEC_SECUREGPCCS)) gk20a_writel(g, gr_fecs_current_ctx_r(), gr_fecs_current_ctx_valid_false_f()); -- cgit v1.2.2