From 31e594befefe63d430885e340175b3f9549b8cc4 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 31 Oct 2017 12:21:07 -0700 Subject: gpu: nvgpu: Split ctxsw_trace API into non-Linux component Split the ctxsw trace "core" API code into . This is not perect though since there's some Linuxisms present in the HAL and as such that code has to be hidden by the ctxsw tracing CONFIG. But this patch should work for QNX such that it will allow the code to build as long as CONFIG_GK20A_CTXSW_TRACE is not set. Also fix the copywrite notice in the ctxsw code present under common/linux to be GPL. JIRA NVGPU-287 Change-Id: I94715864caf335b7220185492e4629d713b025e0 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1589429 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ctxsw_trace.c | 27 +++++++----------- drivers/gpu/nvgpu/common/linux/ctxsw_trace.h | 39 ++++++++++++++++++++++++++ drivers/gpu/nvgpu/common/linux/ioctl.c | 4 ++- drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 3 +- drivers/gpu/nvgpu/common/linux/module.c | 4 ++- 5 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 drivers/gpu/nvgpu/common/linux/ctxsw_trace.h (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c index 81a54b7e..a4a07a4c 100644 --- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c @@ -1,26 +1,19 @@ /* * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * 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. * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * 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. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include #include #include #include @@ -30,7 +23,6 @@ #include "gk20a/gk20a.h" #include "gk20a/gr_gk20a.h" -#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/platform_gk20a.h" #include @@ -39,6 +31,7 @@ #include #include "os_linux.h" +#include "ctxsw_trace.h" #include #include diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h new file mode 100644 index 00000000..88ca7f25 --- /dev/null +++ b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016-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 . + */ + +#ifndef __CTXSW_TRACE_H__ +#define __CTXSW_TRACE_H__ + +#include + +#define GK20A_CTXSW_TRACE_NUM_DEVS 1 + +struct file; +struct inode; +struct poll_table_struct; + +struct gk20a; + +int gk20a_ctxsw_dev_release(struct inode *inode, struct file *filp); +int gk20a_ctxsw_dev_open(struct inode *inode, struct file *filp); +long gk20a_ctxsw_dev_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg); +ssize_t gk20a_ctxsw_dev_read(struct file *filp, char __user *buf, + size_t size, loff_t *offs); +unsigned int gk20a_ctxsw_dev_poll(struct file *filp, + struct poll_table_struct *pts); + +#endif /* __CTXSW_TRACE_H__ */ diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/common/linux/ioctl.c index 7e6df9df..c1053268 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl.c @@ -19,11 +19,12 @@ #include #include +#include #include "gk20a/gk20a.h" #include "gk20a/platform_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" -#include "gk20a/ctxsw_trace_gk20a.h" + #include "ioctl_channel.h" #include "ioctl_ctrl.h" #include "ioctl_as.h" @@ -31,6 +32,7 @@ #include "ioctl_dbg.h" #include "module.h" #include "os_linux.h" +#include "ctxsw_trace.h" #define GK20A_NUM_CDEVS 7 diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 7814aea5..91dfc630 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c @@ -31,12 +31,13 @@ #include #include "gk20a/gk20a.h" -#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/fence_gk20a.h" #include "gk20a/platform_gk20a.h" + #include "ioctl_channel.h" #include "os_linux.h" +#include "ctxsw_trace.h" static const char *gr_gk20a_graphics_preempt_mode_name(u32 graphics_preempt_mode) { diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index d0abc836..b06f86ab 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c @@ -31,12 +31,12 @@ #include #include #include +#include #include "gk20a/platform_gk20a.h" #include "sysfs.h" #include "vgpu/vgpu.h" #include "scale.h" -#include "gk20a/ctxsw_trace_gk20a.h" #include "pci.h" #include "module.h" #include "intr.h" @@ -48,9 +48,11 @@ #include "vgpu/vgpu_t19x.h" #endif #endif + #include "os_linux.h" #include "cde_gm20b.h" #include "cde_gp10b.h" +#include "ctxsw_trace.h" #define CLASS_NAME "nvidia-gpu" /* TODO: Change to e.g. "nvidia-gpu%s" once we have symlinks in place. */ -- cgit v1.2.2