diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/pmu_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/pmu_gp106.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index d4041905..2a52dd4e 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -98,14 +98,14 @@ u32 gp106_pmu_pg_engines_list(struct gk20a *g) | |||
98 | static void pmu_handle_param_msg(struct gk20a *g, struct pmu_msg *msg, | 98 | static void pmu_handle_param_msg(struct gk20a *g, struct pmu_msg *msg, |
99 | void *param, u32 handle, u32 status) | 99 | void *param, u32 handle, u32 status) |
100 | { | 100 | { |
101 | gk20a_dbg_fn(""); | 101 | nvgpu_log_fn(g, " "); |
102 | 102 | ||
103 | if (status != 0) { | 103 | if (status != 0) { |
104 | nvgpu_err(g, "PG PARAM cmd aborted"); | 104 | nvgpu_err(g, "PG PARAM cmd aborted"); |
105 | return; | 105 | return; |
106 | } | 106 | } |
107 | 107 | ||
108 | gp106_dbg_pmu("PG PARAM is acknowledged from PMU %x", | 108 | gp106_dbg_pmu(g, "PG PARAM is acknowledged from PMU %x", |
109 | msg->msg.pg.msg_type); | 109 | msg->msg.pg.msg_type); |
110 | } | 110 | } |
111 | 111 | ||
@@ -135,7 +135,7 @@ int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) | |||
135 | cmd.cmd.pg.gr_init_param.featuremask = | 135 | cmd.cmd.pg.gr_init_param.featuremask = |
136 | NVGPU_PMU_GR_FEATURE_MASK_RPPG; | 136 | NVGPU_PMU_GR_FEATURE_MASK_RPPG; |
137 | 137 | ||
138 | gp106_dbg_pmu("cmd post GR PMU_PG_CMD_ID_PG_PARAM"); | 138 | gp106_dbg_pmu(g, "cmd post GR PMU_PG_CMD_ID_PG_PARAM"); |
139 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 139 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
140 | pmu_handle_param_msg, pmu, &seq, ~0); | 140 | pmu_handle_param_msg, pmu, &seq, ~0); |
141 | } else if (pg_engine_id == PMU_PG_ELPG_ENGINE_ID_MS) { | 141 | } else if (pg_engine_id == PMU_PG_ELPG_ENGINE_ID_MS) { |
@@ -152,7 +152,7 @@ int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) | |||
152 | NVGPU_PMU_MS_FEATURE_MASK_RPPG | | 152 | NVGPU_PMU_MS_FEATURE_MASK_RPPG | |
153 | NVGPU_PMU_MS_FEATURE_MASK_FB_TRAINING; | 153 | NVGPU_PMU_MS_FEATURE_MASK_FB_TRAINING; |
154 | 154 | ||
155 | gp106_dbg_pmu("cmd post MS PMU_PG_CMD_ID_PG_PARAM"); | 155 | gp106_dbg_pmu(g, "cmd post MS PMU_PG_CMD_ID_PG_PARAM"); |
156 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 156 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
157 | pmu_handle_param_msg, pmu, &seq, ~0); | 157 | pmu_handle_param_msg, pmu, &seq, ~0); |
158 | } | 158 | } |
@@ -240,9 +240,9 @@ static void gp106_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, | |||
240 | struct pmu_cmd cmd; | 240 | struct pmu_cmd cmd; |
241 | u32 seq; | 241 | u32 seq; |
242 | 242 | ||
243 | gk20a_dbg_fn(""); | 243 | nvgpu_log_fn(g, " "); |
244 | 244 | ||
245 | gp106_dbg_pmu("wprinit status = %x\n", g->pmu_lsf_pmu_wpr_init_done); | 245 | gp106_dbg_pmu(g, "wprinit status = %x\n", g->pmu_lsf_pmu_wpr_init_done); |
246 | if (g->pmu_lsf_pmu_wpr_init_done) { | 246 | if (g->pmu_lsf_pmu_wpr_init_done) { |
247 | /* send message to load FECS falcon */ | 247 | /* send message to load FECS falcon */ |
248 | memset(&cmd, 0, sizeof(struct pmu_cmd)); | 248 | memset(&cmd, 0, sizeof(struct pmu_cmd)); |
@@ -258,13 +258,13 @@ static void gp106_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, | |||
258 | cmd.cmd.acr.boot_falcons.wprvirtualbase.lo = 0; | 258 | cmd.cmd.acr.boot_falcons.wprvirtualbase.lo = 0; |
259 | cmd.cmd.acr.boot_falcons.wprvirtualbase.hi = 0; | 259 | cmd.cmd.acr.boot_falcons.wprvirtualbase.hi = 0; |
260 | 260 | ||
261 | gp106_dbg_pmu("PMU_ACR_CMD_ID_BOOTSTRAP_MULTIPLE_FALCONS:%x\n", | 261 | gp106_dbg_pmu(g, "PMU_ACR_CMD_ID_BOOTSTRAP_MULTIPLE_FALCONS:%x\n", |
262 | falconidmask); | 262 | falconidmask); |
263 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 263 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
264 | pmu_handle_fecs_boot_acr_msg, pmu, &seq, ~0); | 264 | pmu_handle_fecs_boot_acr_msg, pmu, &seq, ~0); |
265 | } | 265 | } |
266 | 266 | ||
267 | gk20a_dbg_fn("done"); | 267 | nvgpu_log_fn(g, "done"); |
268 | } | 268 | } |
269 | 269 | ||
270 | int gp106_load_falcon_ucode(struct gk20a *g, u32 falconidmask) | 270 | int gp106_load_falcon_ucode(struct gk20a *g, u32 falconidmask) |