Merge remote-tracking branch 'remotes/origin/dev/linux-nvgpu-t19x' into linux-nvgpu

Bug 200363166

Change-Id: Ic662d7b44b673db28dc0aeba338ae67cf2a43d64
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>

3 files changed, 138 insertions, 0 deletions

diff --git a/include/linux/tegra_gpu_t19x.h b/include/linux/tegra_gpu_t19x.h
new file mode 100644
index 00000000..f6157c12
--- /dev/null
+++ b/include/linux/tegra_gpu_t19x.h
@@ -0,0 +1,24 @@
+/*
+ * Tegra GPU Virtualization Interfaces to Server
+ *
+ * Copyright (c) 2016, 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 __TEGRA_GPU_T19X_H
+#define __TEGRA_GPU_T19X_H
+
+#define GPU_LIT_NUM_SUBCTX      99
+
+#endif
diff --git a/include/linux/tegra_vgpu_t19x.h b/include/linux/tegra_vgpu_t19x.h
new file mode 100644
index 00000000..38dbbf60
--- /dev/null
+++ b/include/linux/tegra_vgpu_t19x.h
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+#ifndef __TEGRA_VGPU_T19X_H
+#define __TEGRA_VGPU_T19X_H
+
+#define TEGRA_VGPU_CMD_ALLOC_CTX_HEADER         100
+#define TEGRA_VGPU_CMD_FREE_CTX_HEADER          101
+#define TEGRA_VGPU_CMD_MAP_SYNCPT               102
+#define TEGRA_VGPU_CMD_TSG_BIND_CHANNEL_EX      103
+
+struct tegra_vgpu_alloc_ctx_header_params {
+        u64 ch_handle;
+        u64 ctx_header_va;
+};
+
+struct tegra_vgpu_free_ctx_header_params {
+        u64 ch_handle;
+};
+
+struct tegra_vgpu_map_syncpt_params {
+        u64 as_handle;
+        u64 gpu_va;
+        u64 len;
+        u64 offset;
+        u8 prot;
+};
+
+struct tegra_vgpu_tsg_bind_channel_ex_params {
+        u32 tsg_id;
+        u64 ch_handle;
+        u32 subctx_id;
+        u32 runqueue_sel;
+};
+
+union tegra_vgpu_t19x_params {
+        struct tegra_vgpu_alloc_ctx_header_params alloc_ctx_header;
+        struct tegra_vgpu_free_ctx_header_params free_ctx_header;
+        struct tegra_vgpu_map_syncpt_params map_syncpt;
+        struct tegra_vgpu_tsg_bind_channel_ex_params tsg_bind_channel_ex;
+};
+
+#define TEGRA_VGPU_ATTRIB_MAX_SUBCTX_COUNT      100
+
+#endif
diff --git a/include/uapi/linux/nvgpu-t19x.h b/include/uapi/linux/nvgpu-t19x.h
new file mode 100644
index 00000000..27db97c0
--- /dev/null
+++ b/include/uapi/linux/nvgpu-t19x.h
@@ -0,0 +1,59 @@
+/*
+ * NVGPU Public Interface Header
+ *
+ * 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.
+ */
+
+/* This file is meant to extend nvgpu.h, not replace it
+ * as such, be sure that nvgpu.h is actually the file performing the
+ * inclusion, to the extent that's possible.
+ */
+#ifndef _UAPI__LINUX_NVGPU_IOCTL_H
+#    error "This file is to be included within nvgpu.h only."
+#endif
+
+#ifndef _UAPI__LINUX_NVGPU_T19X_IOCTL_H_
+#define _UAPI__LINUX_NVGPU_T19X_IOCTL_H_
+
+#define NVGPU_GPU_ARCH_GV110 0x00000150
+#define NVGPU_GPU_ARCH_GV100 0x00000140
+#define NVGPU_GPU_IMPL_GV11B 0x0000000B
+#define NVGPU_GPU_IMPL_GV100 0x00000000
+
+/*
+ * this flag is used in struct nvgpu_as_map_buffer_ex_args
+ * to provide L3 cache allocation hint
+ */
+#define NVGPU_AS_MAP_BUFFER_FLAGS_L3_ALLOC      (1 << 7)
+
+/*  subcontexts are available */
+#define NVGPU_GPU_FLAGS_SUPPORT_TSG_SUBCONTEXTS         (1ULL << 22)
+
+struct nvgpu_tsg_bind_channel_ex_args {
+        /* in: channel fd */
+        __s32 channel_fd;
+
+        /* in: VEID in Volta */
+        __u32 subcontext_id;
+        __u32 num_active_tpcs;
+        __u8 tpc_pg_enabled;
+        __u8 reserved[11];
+};
+
+#define NVGPU_TSG_IOCTL_BIND_CHANNEL_EX \
+        _IOWR(NVGPU_TSG_IOCTL_MAGIC, 11, struct nvgpu_tsg_bind_channel_ex_args)
+
+#define NVGPU_TSG_IOCTL_MAX NVGPU_TSG_IOCTL_BIND_CHANNEL_EX
+
+#define NVGPU_TSG_IOCTL_MAX_ARG sizeof(struct nvgpu_tsg_bind_channel_ex_args)
+
+#endif /* _UAPI__LINUX_NVGPU_T19X_IOCTL_H_ */