mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-24 02:22:34 +03:00
gpu: nvgpu: rename syncpt and sema HALs
Renamed the following HALs - syncpt.alloc_syncpt_buf -> syncpt.alloc_buf - syncpt.free_syncpt_buf -> syncpt.free_buf - syncpt.add_syncpt_wait_cmd -> syncpt.add_wait_cmd - syncpt.get_syncpt_wait_cmd_size -> syncpt.get_wait_cmd_size - syncpt.get_syncpt_incr_per_release -> syncpt.get_incr_per_release - syncpt.add_syncpt_incr_cmd -> syncpt.add_incr_cmd - syncpt.get_syncpt_incr_cmd_size -> syncpt.get_incr_cmd_size - syncpt.get_sync_ro_map -> syncpt.get_sync_ro_map - sema.get_sema_wait_cmd_size -> sema.get_wait_cmd_size - sema.get_sema_incr_cmd_size -> sema.get_incr_cmd_size - sema.add_sema_cmd -> sema.add_cmd Renamed HAL implementations as: - gk20a_alloc_syncpt_buf -> gk20a_syncpt_alloc_buf - gk20a_free_syncpt_buf -> gk20a_syncpt_free_buf - gk20a_add_syncpt_wait_cmd -> gk20a_syncpt_add_wait_cmd - gk20a_get_syncpt_wait_cmd_size -> gk20a_syncpt_get_wait_cmd_size - gk20a_get_syncpt_incr_per_release -> gk20a_syncpt_get_incr_per_release - gk20a_add_syncpt_incr_cmd -> gk20a_syncpt_add_incr_cmd - gk20a_get_syncpt_incr_cmd_size -> gk20a_syncpt_get_incr_cmd_size - gv11b_alloc_syncpt_buf -> gv11b_syncpt_alloc_buf - gv11b_free_syncpt_buf -> gv11b_syncpt_free_buf - gv11b_add_syncpt_wait_cmd -> gv11b_syncpt_add_wait_cmd - gv11b_get_syncpt_wait_cmd_size -> gv11b_syncpt_get_wait_cmd_size - gv11b_add_syncpt_incr_cmd -> gv11b_syncpt_add_incr_cmd - gv11b_get_syncpt_incr_cmd_size -> gv11b_syncpt_get_incr_cmd_size - gv11b_get_syncpt_incr_per_release -> gv11b_syncpt_get_incr_per_release - gv11b_get_sync_ro_map -> gv11b_syncpt_get_sync_ro_map - gk20a_get_sema_wait_cmd_size -> gk20a_sema_get_wait_cmd_size - gk20a_get_sema_incr_cmd_size -> gk20a_sema_get_incr_cmd_size - gk20a_add_sema_cmd -> gk20a_sema_add_cmd - gv11b_get_sema_wait_cmd_size -> gv11b_sema_get_wait_cmd_size - gv11b_get_sema_incr_cmd_size -> gv11b_sema_get_incr_cmd_size - gv11b_add_sema_cmd -> gv11b_sema_add_cmd Jira NVGPU-1984 Jira NVGPU-1986 Change-Id: I3eb3f669093588df422a82c54fa1ca64788a490c Signed-off-by: Thomas Fleury <tfleury@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/2096374 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
656a9aa170
commit
c270bb73ae
@@ -72,7 +72,7 @@ static int channel_sync_syncpt_gen_wait_cmd(struct channel_gk20a *c,
|
||||
} else {
|
||||
if (!preallocated) {
|
||||
err = gk20a_channel_alloc_priv_cmdbuf(c,
|
||||
c->g->ops.sync.syncpt.get_syncpt_wait_cmd_size(),
|
||||
c->g->ops.sync.syncpt.get_wait_cmd_size(),
|
||||
wait_cmd);
|
||||
if (err != 0) {
|
||||
nvgpu_err(c->g, "not enough priv cmd buffer space");
|
||||
@@ -81,7 +81,7 @@ static int channel_sync_syncpt_gen_wait_cmd(struct channel_gk20a *c,
|
||||
}
|
||||
nvgpu_log(c->g, gpu_dbg_info, "sp->id %d gpu va %llx",
|
||||
id, c->vm->syncpt_ro_map_gpu_va);
|
||||
c->g->ops.sync.syncpt.add_syncpt_wait_cmd(c->g, wait_cmd,
|
||||
c->g->ops.sync.syncpt.add_wait_cmd(c->g, wait_cmd,
|
||||
pos * wait_cmd_size, id, thresh,
|
||||
c->vm->syncpt_ro_map_gpu_va);
|
||||
}
|
||||
@@ -94,7 +94,7 @@ static int channel_sync_syncpt_wait_raw(struct nvgpu_channel_sync_syncpt *s,
|
||||
{
|
||||
struct channel_gk20a *c = s->c;
|
||||
int err = 0;
|
||||
u32 wait_cmd_size = c->g->ops.sync.syncpt.get_syncpt_wait_cmd_size();
|
||||
u32 wait_cmd_size = c->g->ops.sync.syncpt.get_wait_cmd_size();
|
||||
|
||||
if (!nvgpu_nvhost_syncpt_is_valid_pt_ext(s->nvhost_dev, id)) {
|
||||
return -EINVAL;
|
||||
@@ -150,7 +150,7 @@ static int channel_sync_syncpt_wait_fd(struct nvgpu_channel_sync *s, int fd,
|
||||
}
|
||||
}
|
||||
|
||||
wait_cmd_size = c->g->ops.sync.syncpt.get_syncpt_wait_cmd_size();
|
||||
wait_cmd_size = c->g->ops.sync.syncpt.get_wait_cmd_size();
|
||||
err = gk20a_channel_alloc_priv_cmdbuf(c,
|
||||
wait_cmd_size * num_fences, wait_cmd);
|
||||
if (err != 0) {
|
||||
@@ -196,7 +196,7 @@ static int channel_sync_syncpt_incr_common(struct nvgpu_channel_sync *s,
|
||||
struct nvgpu_os_fence os_fence = {0};
|
||||
|
||||
err = gk20a_channel_alloc_priv_cmdbuf(c,
|
||||
c->g->ops.sync.syncpt.get_syncpt_incr_cmd_size(wfi_cmd),
|
||||
c->g->ops.sync.syncpt.get_incr_cmd_size(wfi_cmd),
|
||||
incr_cmd);
|
||||
if (err != 0) {
|
||||
return err;
|
||||
@@ -204,11 +204,11 @@ static int channel_sync_syncpt_incr_common(struct nvgpu_channel_sync *s,
|
||||
|
||||
nvgpu_log(c->g, gpu_dbg_info, "sp->id %d gpu va %llx",
|
||||
sp->id, sp->syncpt_buf.gpu_va);
|
||||
c->g->ops.sync.syncpt.add_syncpt_incr_cmd(c->g, wfi_cmd,
|
||||
c->g->ops.sync.syncpt.add_incr_cmd(c->g, wfi_cmd,
|
||||
incr_cmd, sp->id, sp->syncpt_buf.gpu_va);
|
||||
|
||||
thresh = nvgpu_nvhost_syncpt_incr_max_ext(sp->nvhost_dev, sp->id,
|
||||
c->g->ops.sync.syncpt.get_syncpt_incr_per_release());
|
||||
c->g->ops.sync.syncpt.get_incr_per_release());
|
||||
|
||||
if (register_irq) {
|
||||
struct channel_gk20a *referenced = gk20a_channel_get(c);
|
||||
@@ -323,7 +323,7 @@ static void channel_sync_syncpt_destroy(struct nvgpu_channel_sync *s)
|
||||
nvgpu_channel_sync_syncpt_from_ops(s);
|
||||
|
||||
|
||||
sp->c->g->ops.sync.syncpt.free_syncpt_buf(sp->c, &sp->syncpt_buf);
|
||||
sp->c->g->ops.sync.syncpt.free_buf(sp->c, &sp->syncpt_buf);
|
||||
|
||||
nvgpu_nvhost_syncpt_set_min_eq_max_ext(sp->nvhost_dev, sp->id);
|
||||
nvgpu_nvhost_syncpt_put_ref_ext(sp->nvhost_dev, sp->id);
|
||||
@@ -391,7 +391,7 @@ nvgpu_channel_sync_syncpt_create(struct channel_gk20a *c, bool user_managed)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sp->c->g->ops.sync.syncpt.alloc_syncpt_buf(sp->c, sp->id,
|
||||
sp->c->g->ops.sync.syncpt.alloc_buf(sp->c, sp->id,
|
||||
&sp->syncpt_buf);
|
||||
|
||||
nvgpu_nvhost_syncpt_set_min_eq_max_ext(sp->nvhost_dev, sp->id);
|
||||
|
||||
Reference in New Issue
Block a user