diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu_pg.c | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index 5edfe4cd..dcf6db9c 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c | |||
@@ -478,7 +478,7 @@ clean_up: | |||
478 | return err; | 478 | return err; |
479 | } | 479 | } |
480 | 480 | ||
481 | int gk20a_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd, | 481 | int nvgpu_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd, |
482 | struct pmu_msg *msg, struct pmu_payload *payload, | 482 | struct pmu_msg *msg, struct pmu_payload *payload, |
483 | u32 queue_id, pmu_callback callback, void *cb_param, | 483 | u32 queue_id, pmu_callback callback, void *cb_param, |
484 | u32 *seq_desc, unsigned long timeout) | 484 | u32 *seq_desc, unsigned long timeout) |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c index 750906ce..f87bd175 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_perfmon.c | |||
@@ -112,7 +112,7 @@ int nvgpu_pmu_init_perfmon(struct nvgpu_pmu *pmu) | |||
112 | payload.in.offset = pv->get_perfmon_cmd_init_offsetofvar(COUNTER_ALLOC); | 112 | payload.in.offset = pv->get_perfmon_cmd_init_offsetofvar(COUNTER_ALLOC); |
113 | 113 | ||
114 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_INIT"); | 114 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_INIT"); |
115 | gk20a_pmu_cmd_post(g, &cmd, NULL, &payload, PMU_COMMAND_QUEUE_LPQ, | 115 | nvgpu_pmu_cmd_post(g, &cmd, NULL, &payload, PMU_COMMAND_QUEUE_LPQ, |
116 | NULL, NULL, &seq, ~0); | 116 | NULL, NULL, &seq, ~0); |
117 | 117 | ||
118 | return 0; | 118 | return 0; |
@@ -160,7 +160,7 @@ int nvgpu_pmu_perfmon_start_sampling(struct nvgpu_pmu *pmu) | |||
160 | pv->get_perfmon_cmd_start_offsetofvar(COUNTER_ALLOC); | 160 | pv->get_perfmon_cmd_start_offsetofvar(COUNTER_ALLOC); |
161 | 161 | ||
162 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_START"); | 162 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_START"); |
163 | gk20a_pmu_cmd_post(g, &cmd, NULL, &payload, PMU_COMMAND_QUEUE_LPQ, | 163 | nvgpu_pmu_cmd_post(g, &cmd, NULL, &payload, PMU_COMMAND_QUEUE_LPQ, |
164 | NULL, NULL, &seq, ~0); | 164 | NULL, NULL, &seq, ~0); |
165 | 165 | ||
166 | return 0; | 166 | return 0; |
@@ -183,7 +183,7 @@ int nvgpu_pmu_perfmon_stop_sampling(struct nvgpu_pmu *pmu) | |||
183 | cmd.cmd.perfmon.stop.cmd_type = PMU_PERFMON_CMD_ID_STOP; | 183 | cmd.cmd.perfmon.stop.cmd_type = PMU_PERFMON_CMD_ID_STOP; |
184 | 184 | ||
185 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_STOP"); | 185 | nvgpu_pmu_dbg(g, "cmd post PMU_PERFMON_CMD_ID_STOP"); |
186 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, | 186 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, |
187 | NULL, NULL, &seq, ~0); | 187 | NULL, NULL, &seq, ~0); |
188 | return 0; | 188 | return 0; |
189 | } | 189 | } |
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index 47ac8b64..06dab8ea 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c | |||
@@ -151,7 +151,7 @@ static int pmu_enable_elpg_locked(struct gk20a *g, u32 pg_engine_id) | |||
151 | pmu->mscg_transition_state = PMU_ELPG_STAT_ON_PENDING; | 151 | pmu->mscg_transition_state = PMU_ELPG_STAT_ON_PENDING; |
152 | 152 | ||
153 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_ALLOW"); | 153 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_ALLOW"); |
154 | status = gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, | 154 | status = nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, |
155 | PMU_COMMAND_QUEUE_HPQ, pmu_handle_pg_elpg_msg, | 155 | PMU_COMMAND_QUEUE_HPQ, pmu_handle_pg_elpg_msg, |
156 | pmu, &seq, ~0); | 156 | pmu, &seq, ~0); |
157 | WARN_ON(status != 0); | 157 | WARN_ON(status != 0); |
@@ -305,7 +305,7 @@ int nvgpu_pmu_disable_elpg(struct gk20a *g) | |||
305 | ptr = &pmu->mscg_transition_state; | 305 | ptr = &pmu->mscg_transition_state; |
306 | 306 | ||
307 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_DISALLOW"); | 307 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_DISALLOW"); |
308 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, | 308 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, |
309 | PMU_COMMAND_QUEUE_HPQ, pmu_handle_pg_elpg_msg, | 309 | PMU_COMMAND_QUEUE_HPQ, pmu_handle_pg_elpg_msg, |
310 | pmu, &seq, ~0); | 310 | pmu, &seq, ~0); |
311 | 311 | ||
@@ -376,7 +376,7 @@ static int pmu_pg_init_send(struct gk20a *g, u32 pg_engine_id) | |||
376 | cmd.cmd.pg.elpg_cmd.cmd = PMU_PG_ELPG_CMD_INIT; | 376 | cmd.cmd.pg.elpg_cmd.cmd = PMU_PG_ELPG_CMD_INIT; |
377 | 377 | ||
378 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_INIT"); | 378 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_INIT"); |
379 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 379 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
380 | pmu_handle_pg_elpg_msg, pmu, &seq, ~0); | 380 | pmu_handle_pg_elpg_msg, pmu, &seq, ~0); |
381 | 381 | ||
382 | /* alloc dmem for powergating state log */ | 382 | /* alloc dmem for powergating state log */ |
@@ -390,7 +390,7 @@ static int pmu_pg_init_send(struct gk20a *g, u32 pg_engine_id) | |||
390 | cmd.cmd.pg.stat.data = 0; | 390 | cmd.cmd.pg.stat.data = 0; |
391 | 391 | ||
392 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_STAT_CMD_ALLOC_DMEM"); | 392 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_STAT_CMD_ALLOC_DMEM"); |
393 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, | 393 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, |
394 | pmu_handle_pg_stat_msg, pmu, &seq, ~0); | 394 | pmu_handle_pg_stat_msg, pmu, &seq, ~0); |
395 | 395 | ||
396 | /* disallow ELPG initially | 396 | /* disallow ELPG initially |
@@ -409,7 +409,7 @@ static int pmu_pg_init_send(struct gk20a *g, u32 pg_engine_id) | |||
409 | cmd.cmd.pg.elpg_cmd.cmd = PMU_PG_ELPG_CMD_DISALLOW; | 409 | cmd.cmd.pg.elpg_cmd.cmd = PMU_PG_ELPG_CMD_DISALLOW; |
410 | 410 | ||
411 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_DISALLOW"); | 411 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_ELPG_CMD_DISALLOW"); |
412 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 412 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
413 | pmu_handle_pg_elpg_msg, pmu, &seq, ~0); | 413 | pmu_handle_pg_elpg_msg, pmu, &seq, ~0); |
414 | 414 | ||
415 | if (g->ops.pmu.pmu_pg_set_sub_feature_mask) | 415 | if (g->ops.pmu.pmu_pg_set_sub_feature_mask) |
@@ -508,7 +508,7 @@ int nvgpu_pmu_init_bind_fecs(struct gk20a *g) | |||
508 | 508 | ||
509 | pmu->buf_loaded = false; | 509 | pmu->buf_loaded = false; |
510 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_CMD_ID_ENG_BUF_LOAD PMU_PGENG_GR_BUFFER_IDX_FECS"); | 510 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_CMD_ID_ENG_BUF_LOAD PMU_PGENG_GR_BUFFER_IDX_FECS"); |
511 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, | 511 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, |
512 | pmu_handle_pg_buf_config_msg, pmu, &desc, ~0); | 512 | pmu_handle_pg_buf_config_msg, pmu, &desc, ~0); |
513 | nvgpu_pmu_state_change(g, PMU_STATE_LOADING_PG_BUF, false); | 513 | nvgpu_pmu_state_change(g, PMU_STATE_LOADING_PG_BUF, false); |
514 | return err; | 514 | return err; |
@@ -544,7 +544,7 @@ void nvgpu_pmu_setup_hw_load_zbc(struct gk20a *g) | |||
544 | 544 | ||
545 | pmu->buf_loaded = false; | 545 | pmu->buf_loaded = false; |
546 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_CMD_ID_ENG_BUF_LOAD PMU_PGENG_GR_BUFFER_IDX_ZBC"); | 546 | nvgpu_pmu_dbg(g, "cmd post PMU_PG_CMD_ID_ENG_BUF_LOAD PMU_PGENG_GR_BUFFER_IDX_ZBC"); |
547 | gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, | 547 | nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_LPQ, |
548 | pmu_handle_pg_buf_config_msg, pmu, &desc, ~0); | 548 | pmu_handle_pg_buf_config_msg, pmu, &desc, ~0); |
549 | nvgpu_pmu_state_change(g, PMU_STATE_LOADING_ZBC, false); | 549 | nvgpu_pmu_state_change(g, PMU_STATE_LOADING_ZBC, false); |
550 | } | 550 | } |
@@ -662,7 +662,7 @@ int nvgpu_pmu_ap_send_command(struct gk20a *g, | |||
662 | return 0x2f; | 662 | return 0x2f; |
663 | } | 663 | } |
664 | 664 | ||
665 | status = gk20a_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, | 665 | status = nvgpu_pmu_cmd_post(g, &cmd, NULL, NULL, PMU_COMMAND_QUEUE_HPQ, |
666 | p_callback, pmu, &seq, ~0); | 666 | p_callback, pmu, &seq, ~0); |
667 | 667 | ||
668 | if (status) { | 668 | if (status) { |