nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Reduce CCM for nvgpu_channel_setup_bind

Browse Source 
A new static function channel_setup_bind_prechecks is constructed.
All precondition checks present in nvgpu_channel_setup_bind are moved
to channel_setup_bind_prechecks.

Jira NVGPU-4063

Change-Id: I1c784bd74628ba95f427d9b53629016e8b0acb9a
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2268076
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
ddutta
2019-12-24 14:17:37 +05:30
committed by Alex Waterman
parent b4dfe2c1f5
commit c9bb9da6da
1 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
drivers/gpu/nvgpu/common/fifo/channel.c
View File

@@ -2198,13 +2198,60 @@ clean_up:
return err;
}
int nvgpu_channel_setup_bind(struct nvgpu_channel *c,
static int channel_setup_bind_prechecks(struct nvgpu_channel *c,
struct nvgpu_setup_bind_args *args)
{
struct gk20a *g = c->g;
struct nvgpu_tsg *tsg;
int err = 0;
/* an address space needs to have been bound at this point. */
if (!nvgpu_channel_as_bound(c)) {
nvgpu_err(g,
"not bound to an address space at time of setup_bind");
err = -EINVAL;
goto fail;
}
/* The channel needs to be bound to a tsg at this point */
tsg = nvgpu_tsg_from_ch(c);
if (tsg == NULL) {
nvgpu_err(g,
"not bound to tsg at time of setup_bind");
err = -EINVAL;
goto fail;
}
if (c->usermode_submit_enabled) {
nvgpu_err(g, "channel %d : "
"usermode buffers allocated", c->chid);
err = -EEXIST;
goto fail;
}
#ifdef CONFIG_NVGPU_KERNEL_MODE_SUBMIT
if (nvgpu_mem_is_valid(&c->gpfifo.mem)) {
nvgpu_err(g, "channel %d :"
"gpfifo already allocated", c->chid);
err = -EEXIST;
goto fail;
}
#endif
fail:
return err;
}
int nvgpu_channel_setup_bind(struct nvgpu_channel *c,
struct nvgpu_setup_bind_args *args)
{
struct gk20a *g = c->g;
int err = 0;
err = channel_setup_bind_prechecks(c, args);
if (err != 0) {
goto fail;
}
#ifdef CONFIG_NVGPU_VPR
if ((args->flags & NVGPU_SETUP_BIND_FLAGS_SUPPORT_VPR) != 0U) {
c->vpr = true;
@@ -2234,39 +2281,6 @@ int nvgpu_channel_setup_bind(struct nvgpu_channel *c,
nvgpu_rwsem_up_read(&g->deterministic_busy);
}
/* an address space needs to have been bound at this point. */
if (!nvgpu_channel_as_bound(c)) {
nvgpu_err(g,
"not bound to an address space at time of setup_bind");
err = -EINVAL;
goto clean_up_idle;
}
/* The channel needs to be bound to a tsg at this point */
tsg = nvgpu_tsg_from_ch(c);
if (tsg == NULL) {
nvgpu_err(g,
"not bound to tsg at time of setup_bind");
err = -EINVAL;
goto clean_up_idle;
}
if (c->usermode_submit_enabled) {
nvgpu_err(g, "channel %d : "
"usermode buffers allocated", c->chid);
err = -EEXIST;
goto clean_up_idle;
}
#ifdef CONFIG_NVGPU_KERNEL_MODE_SUBMIT
if (nvgpu_mem_is_valid(&c->gpfifo.mem)) {
nvgpu_err(g, "channel %d :"
"gpfifo already allocated", c->chid);
err = -EEXIST;
goto clean_up_idle;
}
#endif
if ((args->flags & NVGPU_SETUP_BIND_FLAGS_USERMODE_SUPPORT) != 0U) {
err = nvgpu_channel_setup_usermode(c, args);
} else {
@@ -2296,6 +2310,7 @@ clean_up_idle:
c->deterministic = false;
nvgpu_rwsem_up_read(&g->deterministic_busy);
}
fail:
nvgpu_err(g, "fail");
return err;
}