nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add channel_user_syncpt

Browse Source 
Refactor user managed syncpoints out of the channel sync infrastructure
that deals with jobs submitted via the kernel api. The user syncpt only
needs to expose the id and gpu address of the reserved syncpoint. None
of the rest (fences, priv cmdbufs) is needed for that, so it hasn't been
ideal to couple with the user-allocated syncpts.

With user syncpts now provided by channel_user_syncpt, remove the
user_managed flag from the kernel sync api.

This allows moving all the kernel submit sync code to be conditionally
compiled in only when needed, and separates the user sync functionality
in a more clear way from the rest with a minimal API.

[this is squashed with commit 5111caea601a (gpu: nvgpu: guard user
syncpt with nvhost config) from
https://git-master.nvidia.com/r/c/linux-nvgpu/+/2325009]

Jira NVGPU-4548

Change-Id: I99259fc9cbd30bbd478ed86acffcce12768502d3
Signed-off-by: Konsta Hölttä <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2321768
(cherry picked from commit 1095ad353f5f1cf7ca180d0701bc02a607404f5e)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2319629
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Hölttä
2020-03-26 11:53:59 +02:00
committed by Alex Waterman
parent b813adbf49
commit 4f80c6b8a9
21 changed files with 380 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
userspace/units/fifo/channel/nvgpu-channel.c
View File

@@ -35,10 +35,10 @@
#include <nvgpu/runlist.h>
#include <nvgpu/debug.h>
#include <nvgpu/thread.h>
#include "common/sync/channel_sync_priv.h"
#include <nvgpu/channel_user_syncpt.h>
#include <nvgpu/posix/posix-fault-injection.h>
#include <nvgpu/posix/posix-nvhost.h>
#include "../nvgpu-fifo-common.h"
#include "nvgpu-channel.h"
@@ -382,22 +382,6 @@ static void stub_gr_intr_flush_channel_tlb(struct gk20a *g)
{
}
static void stub_channel_sync_syncpt_set_safe_state(
struct nvgpu_channel_sync *s)
{
}
static void stub_channel_sync_destroy(struct nvgpu_channel_sync *s)
{
stub[0].chid = 1;
}
static const struct nvgpu_channel_sync_ops stub_channel_sync_ops = {
.set_safe_state = stub_channel_sync_syncpt_set_safe_state,
.destroy = stub_channel_sync_destroy,
};
static bool channel_close_pruned(u32 branches, u32 final)
{
u32 branches_init = branches;
@@ -426,7 +410,6 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
struct gpu_ops gops = g->ops;
struct nvgpu_channel *ch = NULL;
struct nvgpu_tsg *tsg;
struct nvgpu_channel_sync user_sync = { {0} };
u32 branches = 0U;
int ret = UNIT_FAIL;
u32 fail = F_CHANNEL_CLOSE_ALREADY_FREED |
@@ -520,17 +503,7 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
gops.gr.setup.free_subctx : NULL;
if (branches & F_CHANNEL_CLOSE_USER_SYNC) {
/* Channel requires to be as_bound */
memset(&mm, 0, sizeof(mm));
memset(&vm, 0, sizeof(vm));
mm.g = g;
vm.mm = &mm;
ch->vm = &vm;
nvgpu_ref_init(&vm.ref);
nvgpu_ref_get(&vm.ref);
ch->user_sync = &user_sync;
ch->user_sync->ops = &stub_channel_sync_ops;
/* TODO: stub ch->user_sync */
}
if (branches & F_CHANNEL_WAIT_UNTIL_COUNTER) {
@@ -561,8 +534,7 @@ int test_channel_close(struct unit_module *m, struct gk20a *g, void *vargs)
}
if ((branches & F_CHANNEL_CLOSE_USER_SYNC) != 0U) {
unit_assert(stub[0].chid == 1U, goto done);
ch->user_sync = NULL;
unit_assert(ch->user_sync == NULL, goto done);
}
if (branches & fail) {
@@ -1915,10 +1887,6 @@ int test_channel_abort_cleanup(struct unit_module *m, struct gk20a *g,
err = nvgpu_tsg_bind_channel(tsg, ch);
unit_assert(err == 0, goto done);
ch->user_sync = nvgpu_kzalloc(g,
sizeof(struct nvgpu_channel_sync));
ch->user_sync->ops = &stub_channel_sync_ops;
err = nvgpu_tsg_unbind_channel(tsg, ch);
unit_assert(err == 0, goto done);