summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/pmu_gp106.c
diff options
context:
space:
mode:
authorSunny He <suhe@nvidia.com>2017-07-24 15:18:38 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-07-26 05:45:14 -0400
commitd59271c7b79080388371877fc2d10574ca42206a (patch)
tree921f6d1ddce07235d7fbd1f27e6510b8cfe56ae7 /drivers/gpu/nvgpu/gp106/pmu_gp106.c
parentde3ad1a94974b08268a485136f04b8e436ef2579 (diff)
gpu: nvgpu: Remove privsecurity flag from gpu_ops
Replace privsecurity boolean flag in gpu_ops with entry in common flag system. The new common flag is NVGPU_SEC_PRIVSECURITY Jira NVGPU-74 Change-Id: I4b258f5ffbe30a6344ffba0ece51c6f5d47ebec1 Signed-off-by: Sunny He <suhe@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1525713 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman <alexw@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/pmu_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/pmu_gp106.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index a09aa30b..a9fb794d 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -12,6 +12,7 @@
12 */ 12 */
13 13
14#include <nvgpu/pmu.h> 14#include <nvgpu/pmu.h>
15#include <nvgpu/enabled.h>
15 16
16#include "gk20a/gk20a.h" 17#include "gk20a/gk20a.h"
17#include "gk20a/pmu_gk20a.h" 18#include "gk20a/pmu_gk20a.h"
@@ -289,11 +290,11 @@ static int gp106_load_falcon_ucode(struct gk20a *g, u32 falconidmask)
289 return 0; 290 return 0;
290} 291}
291 292
292void gp106_init_pmu_ops(struct gpu_ops *gops) 293void gp106_init_pmu_ops(struct gk20a *g)
293{ 294{
295 struct gpu_ops *gops = &g->ops;
294 gk20a_dbg_fn(""); 296 gk20a_dbg_fn("");
295 297 if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {
296 if (gops->privsecurity) {
297 gp106_init_secure_pmu(gops); 298 gp106_init_secure_pmu(gops);
298 gops->pmu.init_wpr_region = gm20b_pmu_init_acr; 299 gops->pmu.init_wpr_region = gm20b_pmu_init_acr;
299 gops->pmu.load_lsfalcon_ucode = gp106_load_falcon_ucode; 300 gops->pmu.load_lsfalcon_ucode = gp106_load_falcon_ucode;