From 70e69e2686527990865b221a60e0ec1e9a53d316 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Mon, 23 Apr 2018 17:26:51 +0530 Subject: gpu: nvgpu: adapt gk20a_channel_syncpt to use os_fence This patch adapts gk20a_channel_syncpt to use os_fence for post fence as well as pre-fence(wait) use cases. Jira NVGPU-66 Change-Id: I49627d1f88d52a53511a02f5de60fed6df8350de Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1676631 Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../nvgpu/common/linux/os_fence_android_syncpt.c | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c (limited to 'drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c') diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c new file mode 100644 index 00000000..76def831 --- /dev/null +++ b/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include +#include +#include +#include +#include + +#include "gk20a/gk20a.h" +#include "gk20a/channel_gk20a.h" +#include "gk20a/sync_gk20a.h" +#include "gk20a/channel_sync_gk20a.h" +#include "gk20a/mm_gk20a.h" + +#include "../drivers/staging/android/sync.h" + +int nvgpu_os_fence_syncpt_wait_gen_cmd(struct nvgpu_os_fence *s, + struct priv_cmd_entry *wait_cmd, + struct channel_gk20a *c, + int max_wait_cmds) +{ + int err; + int wait_cmd_size; + int num_wait_cmds; + int i; + u32 wait_id; + struct sync_pt *pt; + + struct sync_fence *sync_fence = (struct sync_fence *)s->priv; + + if (max_wait_cmds && sync_fence->num_fences > max_wait_cmds) + return -EINVAL; + + /* validate syncpt ids */ + for (i = 0; i < sync_fence->num_fences; i++) { + pt = sync_pt_from_fence(sync_fence->cbs[i].sync_pt); + wait_id = nvgpu_nvhost_sync_pt_id(pt); + if (!wait_id || !nvgpu_nvhost_syncpt_is_valid_pt_ext( + c->g->nvhost_dev, wait_id)) { + return -EINVAL; + } + } + + num_wait_cmds = nvgpu_nvhost_sync_num_pts(sync_fence); + if (num_wait_cmds == 0) + return 0; + + wait_cmd_size = c->g->ops.fifo.get_syncpt_wait_cmd_size(); + err = gk20a_channel_alloc_priv_cmdbuf(c, + wait_cmd_size * num_wait_cmds, wait_cmd); + if (err) { + nvgpu_err(c->g, + "not enough priv cmd buffer space"); + return err; + } + + for (i = 0; i < sync_fence->num_fences; i++) { + struct fence *f = sync_fence->cbs[i].sync_pt; + struct sync_pt *pt = sync_pt_from_fence(f); + u32 wait_id = nvgpu_nvhost_sync_pt_id(pt); + u32 wait_value = nvgpu_nvhost_sync_pt_thresh(pt); + + err = gk20a_channel_gen_syncpt_wait_cmd(c, wait_id, wait_value, + wait_cmd, wait_cmd_size, i, true); + } + + WARN_ON(i != num_wait_cmds); + + return 0; +} + +static const struct nvgpu_os_fence_ops syncpt_ops = { + .program_waits = nvgpu_os_fence_syncpt_wait_gen_cmd, + .drop_ref = nvgpu_os_fence_android_drop_ref, +}; + +int nvgpu_os_fence_syncpt_create( + struct nvgpu_os_fence *fence_out, struct channel_gk20a *c, + struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 thresh) +{ + struct sync_fence *fence = nvgpu_nvhost_sync_create_fence( + nvhost_dev, id, thresh, "fence"); + + if (!fence) { + nvgpu_err(c->g, "error constructing fence %s", "fence"); + return -ENOMEM; + } + + nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence); + + return 0; +} + +int nvgpu_os_fence_syncpt_fdget(struct nvgpu_os_fence *fence_out, + struct channel_gk20a *c, int fd) +{ + struct sync_fence *fence = nvgpu_nvhost_sync_fdget(fd); + + if (!fence) + return -ENOMEM; + + nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence); + + return 0; +} \ No newline at end of file -- cgit v1.2.2