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

gpu: nvgpu: make os_fence_android_syncpt common

Browse Source 
The differences between sync_fence ("android sync") and dma_fence are
abstracted away by nvhost in the nvhost_fence interface. There is no
need to have separate android and dma os fences for syncpoints; unify
the general implementation so that it's always used when requested for
the build.

Jira NVGPU-5386

Change-Id: Ia829e93e18d03064ff46ab1271547de2d1fb1cae
Signed-off-by: Konsta Hölttä <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2356158
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-06-05 09:44:59 +03:00
committed by Alex Waterman
parent 4e241d5974
commit 98335c29b2
11 changed files with 57 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
drivers/gpu/nvgpu/os/linux/os_fence_syncpt.c Normal file
View File

@@ -0,0 +1,113 @@
/*
* Copyright (c) 2018-2020, 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 <http://www.gnu.org/licenses/>.
*/
#include <uapi/linux/nvhost_ioctl.h>
#include <linux/err.h>
#include <linux/nvhost.h>
#include <nvgpu/errno.h>
#include <nvgpu/types.h>
#include <nvgpu/os_fence.h>
#include <nvgpu/os_fence_syncpts.h>
#include <nvgpu/nvhost.h>
#include <nvgpu/atomic.h>
#include <nvgpu/gk20a.h>
#include <nvgpu/channel.h>
#include <nvgpu/channel_sync.h>
#include "os_fence_priv.h"
#include "nvhost_priv.h"
static int nvgpu_os_fence_syncpt_install_fd(struct nvgpu_os_fence *s,
int fd)
{
return nvhost_fence_install(s->priv, fd);
}
static void nvgpu_os_fence_syncpt_drop_ref(struct nvgpu_os_fence *s)
{
nvhost_fence_put(s->priv);
nvgpu_os_fence_clear(s);
}
static const struct nvgpu_os_fence_ops syncpt_ops = {
.drop_ref = nvgpu_os_fence_syncpt_drop_ref,
.install_fence = nvgpu_os_fence_syncpt_install_fd,
};
int nvgpu_os_fence_syncpt_create(struct nvgpu_os_fence *fence_out,
struct nvgpu_channel *c, struct nvgpu_nvhost_dev *nvhost_dev,
u32 id, u32 thresh)
{
struct nvhost_ctrl_sync_fence_info pt = {
.id = id,
.thresh = thresh,
};
struct nvhost_fence *fence = nvhost_fence_create(
nvhost_dev->host1x_pdev, &pt, 1, "fence");
if (IS_ERR(fence)) {
nvgpu_err(c->g, "error %d during construction of fence.",
(int)PTR_ERR(fence));
return PTR_ERR(fence);
}
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 nvgpu_channel *c, int fd)
{
struct nvhost_fence *fence = nvhost_fence_get(fd);
if (fence == NULL) {
return -ENOMEM;
}
nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence);
return 0;
}
int nvgpu_os_fence_get_syncpts(
struct nvgpu_os_fence_syncpt *fence_syncpt_out,
struct nvgpu_os_fence *fence_in)
{
if (fence_in->ops != &syncpt_ops) {
return -EINVAL;
}
fence_syncpt_out->fence = fence_in;
return 0;
}
u32 nvgpu_os_fence_syncpt_get_num_syncpoints(
struct nvgpu_os_fence_syncpt *fence)
{
return nvhost_fence_num_pts(fence->fence->priv);
}
int nvgpu_os_fence_syncpt_foreach_pt(
struct nvgpu_os_fence_syncpt *fence,
int (*iter)(struct nvhost_ctrl_sync_fence_info, void *),
void *data)
{
return nvhost_fence_foreach_pt(fence->fence->priv, iter, data);
}