mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-23 01:50:07 +03:00
gpu: nvgpu: add nvhost abstraction files
Add new abstraction file common/linux/nvhost.c for all nvhost APIs and operations and export them from header <nvgpu/nvhost.h> This file will be compiled only if config CONFIG_TEGRA_GK20A_NVHOST is set Define struct nvgpu_nvhost_dev in a separate private header nvhost_priv.h Jira NVGPU-29 Change-Id: I17e1f7836d4854feadff0c339bc093e78ba7f3eb Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1489725 Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
942029a433
commit
2c9713e21c
@@ -131,6 +131,7 @@ nvgpu-$(CONFIG_DEBUG_FS) += \
|
||||
nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gk20a_tegra.o
|
||||
nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o
|
||||
nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o
|
||||
nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost.o
|
||||
|
||||
nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
|
||||
gk20a/platform_vgpu_tegra.o \
|
||||
|
||||
208
drivers/gpu/nvgpu/common/linux/nvhost.c
Normal file
208
drivers/gpu/nvgpu/common/linux/nvhost.c
Normal file
@@ -0,0 +1,208 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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 <linux/nvhost.h>
|
||||
#include <linux/nvhost_ioctl.h>
|
||||
#include <linux/of_platform.h>
|
||||
|
||||
#include <nvgpu/nvhost.h>
|
||||
|
||||
#include "nvhost_priv.h"
|
||||
|
||||
#include "gk20a/gk20a.h"
|
||||
|
||||
int nvgpu_get_nvhost_dev(struct gk20a *g)
|
||||
{
|
||||
struct device_node *np = g->dev->of_node;
|
||||
struct platform_device *host1x_pdev = NULL;
|
||||
const __be32 *host1x_ptr;
|
||||
|
||||
host1x_ptr = of_get_property(np, "nvidia,host1x", NULL);
|
||||
if (host1x_ptr) {
|
||||
struct device_node *host1x_node =
|
||||
of_find_node_by_phandle(be32_to_cpup(host1x_ptr));
|
||||
|
||||
host1x_pdev = of_find_device_by_node(host1x_node);
|
||||
if (!host1x_pdev) {
|
||||
dev_warn(g->dev, "host1x device not available");
|
||||
return -EPROBE_DEFER;
|
||||
}
|
||||
|
||||
} else {
|
||||
host1x_pdev = to_platform_device(g->dev->parent);
|
||||
dev_warn(g->dev, "host1x reference not found. assuming host1x to be parent");
|
||||
}
|
||||
|
||||
g->nvhost_dev = nvgpu_kzalloc(g, sizeof(struct nvgpu_nvhost_dev));
|
||||
if (!g->nvhost_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
g->nvhost_dev->host1x_pdev = host1x_pdev;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void nvgpu_free_nvhost_dev(struct gk20a *g)
|
||||
{
|
||||
nvgpu_kfree(g, g->nvhost_dev);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_module_busy_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev)
|
||||
{
|
||||
return nvhost_module_busy_ext(nvhost_dev->host1x_pdev);
|
||||
}
|
||||
|
||||
void nvgpu_nvhost_module_idle_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev)
|
||||
{
|
||||
nvhost_module_idle_ext(nvhost_dev->host1x_pdev);
|
||||
}
|
||||
|
||||
void nvgpu_nvhost_debug_dump_device(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev)
|
||||
{
|
||||
nvhost_debug_dump_device(nvhost_dev->host1x_pdev);
|
||||
}
|
||||
|
||||
const char *nvgpu_nvhost_syncpt_get_name(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, int id)
|
||||
{
|
||||
return nvhost_syncpt_get_name(nvhost_dev->host1x_pdev, id);
|
||||
}
|
||||
|
||||
bool nvgpu_nvhost_syncpt_is_valid_pt_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id)
|
||||
{
|
||||
return nvhost_syncpt_is_valid_pt_ext(nvhost_dev->host1x_pdev, id);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_syncpt_is_expired_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 thresh)
|
||||
{
|
||||
return nvhost_syncpt_is_expired_ext(nvhost_dev->host1x_pdev,
|
||||
id, thresh);
|
||||
}
|
||||
|
||||
u32 nvgpu_nvhost_syncpt_incr_max_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 incrs)
|
||||
{
|
||||
return nvhost_syncpt_incr_max_ext(nvhost_dev->host1x_pdev, id, incrs);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_intr_register_notifier(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 thresh,
|
||||
void (*callback)(void *, int), void *private_data)
|
||||
{
|
||||
return nvhost_intr_register_notifier(nvhost_dev->host1x_pdev,
|
||||
id, thresh,
|
||||
callback, private_data);
|
||||
}
|
||||
|
||||
void nvgpu_nvhost_syncpt_set_min_eq_max_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id)
|
||||
{
|
||||
nvhost_syncpt_set_min_eq_max_ext(nvhost_dev->host1x_pdev, id);
|
||||
}
|
||||
|
||||
void nvgpu_nvhost_syncpt_put_ref_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id)
|
||||
{
|
||||
nvhost_syncpt_put_ref_ext(nvhost_dev->host1x_pdev, id);
|
||||
}
|
||||
|
||||
u32 nvgpu_nvhost_get_syncpt_host_managed(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 param, const char *syncpt_name)
|
||||
{
|
||||
return nvhost_get_syncpt_host_managed(nvhost_dev->host1x_pdev,
|
||||
param, syncpt_name);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_syncpt_wait_timeout_ext(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id,
|
||||
u32 thresh, u32 timeout, u32 *value, struct timespec *ts)
|
||||
{
|
||||
return nvhost_syncpt_wait_timeout_ext(nvhost_dev->host1x_pdev,
|
||||
id, thresh, timeout, value, ts);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_syncpt_read_ext_check(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 *val)
|
||||
{
|
||||
return nvhost_syncpt_read_ext_check(nvhost_dev->host1x_pdev, id, val);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_create_symlink(struct gk20a *g)
|
||||
{
|
||||
struct device *dev = g->dev;
|
||||
int err = 0;
|
||||
|
||||
if (g->nvhost_dev &&
|
||||
(dev->parent != &g->nvhost_dev->host1x_pdev->dev)) {
|
||||
err = sysfs_create_link(&g->nvhost_dev->host1x_pdev->dev.kobj,
|
||||
&dev->kobj,
|
||||
dev_name(dev));
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
void nvgpu_nvhost_remove_symlink(struct gk20a *g)
|
||||
{
|
||||
struct device *dev = g->dev;
|
||||
|
||||
if (g->nvhost_dev &&
|
||||
(dev->parent != &g->nvhost_dev->host1x_pdev->dev)) {
|
||||
sysfs_remove_link(&g->nvhost_dev->host1x_pdev->dev.kobj,
|
||||
dev_name(dev));
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYNC
|
||||
u32 nvgpu_nvhost_sync_pt_id(struct sync_pt *pt)
|
||||
{
|
||||
return nvhost_sync_pt_id(pt);
|
||||
}
|
||||
|
||||
u32 nvgpu_nvhost_sync_pt_thresh(struct sync_pt *pt)
|
||||
{
|
||||
return nvhost_sync_pt_thresh(pt);
|
||||
}
|
||||
|
||||
struct sync_fence *nvgpu_nvhost_sync_fdget(int fd)
|
||||
{
|
||||
return nvhost_sync_fdget(fd);
|
||||
}
|
||||
|
||||
int nvgpu_nvhost_sync_num_pts(struct sync_fence *fence)
|
||||
{
|
||||
return nvhost_sync_num_pts(fence);
|
||||
}
|
||||
|
||||
struct sync_fence *nvgpu_nvhost_sync_create_fence(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 thresh,
|
||||
u32 num_pts, const char *name)
|
||||
{
|
||||
struct nvhost_ctrl_sync_fence_info pt = {
|
||||
.id = id,
|
||||
.thresh = thresh,
|
||||
};
|
||||
|
||||
return nvhost_sync_create_fence(nvhost_dev->host1x_pdev, &pt, num_pts, name);
|
||||
}
|
||||
#endif /* CONFIG_SYNC */
|
||||
24
drivers/gpu/nvgpu/common/linux/nvhost_priv.h
Normal file
24
drivers/gpu/nvgpu/common/linux/nvhost_priv.h
Normal file
@@ -0,0 +1,24 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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/>.
|
||||
*/
|
||||
|
||||
#ifndef __NVGPU_NVHOST_PRIV_H__
|
||||
#define __NVGPU_NVHOST_PRIV_H__
|
||||
|
||||
struct nvgpu_nvhost_dev {
|
||||
struct platform_device *host1x_pdev;
|
||||
};
|
||||
|
||||
#endif /* __NVGPU_NVHOST_PRIV_H__ */
|
||||
@@ -32,6 +32,7 @@ struct dbg_profiler_object_data;
|
||||
struct ecc_gk20a;
|
||||
struct gk20a_debug_output;
|
||||
struct nvgpu_clk_pll_debug_data;
|
||||
struct nvgpu_nvhost_dev;
|
||||
|
||||
#include <linux/sched.h>
|
||||
#include <nvgpu/lock.h>
|
||||
@@ -981,6 +982,7 @@ struct nvgpu_bios {
|
||||
struct gk20a {
|
||||
struct device *dev;
|
||||
struct platform_device *host1x_dev;
|
||||
struct nvgpu_nvhost_dev *nvhost_dev;
|
||||
|
||||
/*
|
||||
* Used by <nvgpu/enabled.h>. Do not access directly!
|
||||
|
||||
75
drivers/gpu/nvgpu/include/nvgpu/nvhost.h
Normal file
75
drivers/gpu/nvgpu/include/nvgpu/nvhost.h
Normal file
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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/>.
|
||||
*/
|
||||
|
||||
#ifndef __NVGPU_NVHOST_H__
|
||||
#define __NVGPU_NVHOST_H__
|
||||
|
||||
#ifdef CONFIG_TEGRA_GK20A_NVHOST
|
||||
|
||||
struct nvgpu_nvhost_dev;
|
||||
struct gk20a;
|
||||
struct sync_pt;
|
||||
struct sync_fence;
|
||||
struct timespec;
|
||||
|
||||
int nvgpu_get_nvhost_dev(struct gk20a *g);
|
||||
void nvgpu_free_nvhost_dev(struct gk20a *g);
|
||||
|
||||
int nvgpu_nvhost_module_busy_ext(struct nvgpu_nvhost_dev *nvhost_dev);
|
||||
void nvgpu_nvhost_module_idle_ext(struct nvgpu_nvhost_dev *nvhost_dev);
|
||||
|
||||
void nvgpu_nvhost_debug_dump_device(struct nvgpu_nvhost_dev *nvhost_dev);
|
||||
|
||||
int nvgpu_nvhost_syncpt_is_expired_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 thresh);
|
||||
int nvgpu_nvhost_syncpt_wait_timeout_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 thresh, u32 timeout, u32 *value, struct timespec *ts);
|
||||
|
||||
u32 nvgpu_nvhost_syncpt_incr_max_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 incrs);
|
||||
void nvgpu_nvhost_syncpt_set_min_eq_max_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id);
|
||||
int nvgpu_nvhost_syncpt_read_ext_check(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 *val);
|
||||
|
||||
int nvgpu_nvhost_intr_register_notifier(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 thresh, void (*callback)(void *, int), void *private_data);
|
||||
|
||||
const char *nvgpu_nvhost_syncpt_get_name(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
int id);
|
||||
bool nvgpu_nvhost_syncpt_is_valid_pt_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id);
|
||||
void nvgpu_nvhost_syncpt_put_ref_ext(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id);
|
||||
u32 nvgpu_nvhost_get_syncpt_host_managed(struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 param,
|
||||
const char *syncpt_name);
|
||||
|
||||
int nvgpu_nvhost_create_symlink(struct gk20a *g);
|
||||
void nvgpu_nvhost_remove_symlink(struct gk20a *g);
|
||||
|
||||
#ifdef CONFIG_SYNC
|
||||
u32 nvgpu_nvhost_sync_pt_id(struct sync_pt *pt);
|
||||
u32 nvgpu_nvhost_sync_pt_thresh(struct sync_pt *pt);
|
||||
int nvgpu_nvhost_sync_num_pts(struct sync_fence *fence);
|
||||
|
||||
struct sync_fence *nvgpu_nvhost_sync_fdget(int fd);
|
||||
struct sync_fence *nvgpu_nvhost_sync_create_fence(
|
||||
struct nvgpu_nvhost_dev *nvhost_dev,
|
||||
u32 id, u32 thresh, u32 num_pts, const char *name);
|
||||
#endif /* CONFIG_SYNC */
|
||||
#endif /* CONFIG_TEGRA_GK20A_NVHOST */
|
||||
#endif /* __NVGPU_NVHOST_H__ */
|
||||
Reference in New Issue
Block a user