diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c index e07984757..6a0da7dc2 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c @@ -16,7 +16,7 @@ #if defined(CONFIG_GK20A_CYCLE_STATS) #include -#include +#include #include #include "gk20a/gk20a.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c index ec6fd875b..90679cc73 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/dbg_vgpu.c @@ -15,8 +15,8 @@ */ #include +#include -#include #include #include "gk20a/gk20a.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c index 67a00c365..52a258931 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c @@ -15,7 +15,6 @@ */ #include -#include #include @@ -24,6 +23,7 @@ #include #include #include +#include #include "gk20a/gk20a.h" #include "vgpu.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c index af25e486c..c2129e4b6 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_fifo_gv11b.c @@ -19,8 +19,7 @@ #include "common/linux/vgpu/vgpu.h" #include "gv11b/fifo_gv11b.h" #include - -#include +#include #ifdef CONFIG_TEGRA_GK20A_NVHOST diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c index a0099f03d..5fbc7bbed 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_subctx_gv11b.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-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, @@ -16,7 +16,7 @@ #include "gk20a/gk20a.h" #include "common/linux/vgpu/vgpu.h" -#include +#include #include int vgpu_gv11b_alloc_subctx_header(struct channel_gk20a *c) diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c index 8b060b24b..82a3db8f4 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_tsg_gv11b.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017-2018, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-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, @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include +#include #include "gk20a/gk20a.h" #include "common/linux/vgpu/vgpu.h" diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c index 19987f0c5..421763ecc 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/tsg_vgpu.c @@ -14,8 +14,6 @@ * along with this program. If not, see . */ -#include - #include "gk20a/gk20a.h" #include "gk20a/channel_gk20a.h" #include "gk20a/tsg_gk20a.h" @@ -24,6 +22,7 @@ #include "fifo_vgpu.h" #include +#include int vgpu_tsg_open(struct tsg_gk20a *tsg) { diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h index f59ad5bfe..e9a73bafb 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h @@ -27,14 +27,13 @@ struct gk20a_platform; #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION #include +#include +#include -#include #include "gk20a/gk20a.h" #include "common/linux/platform_gk20a.h" #include "common/linux/os_linux.h" -#include - struct vgpu_priv_data { u64 virt_handle; struct nvgpu_thread intr_handler; diff --git a/include/linux/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h similarity index 93% rename from include/linux/tegra_vgpu.h rename to drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h index 9980f4bc8..78d64ebb4 100644 --- a/include/linux/tegra_vgpu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h @@ -1,19 +1,25 @@ /* * Tegra GPU Virtualization Interfaces to Server * - * Copyright (c) 2014-2018, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2014-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. + * 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 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 above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ #ifndef __TEGRA_VGPU_H @@ -81,7 +87,7 @@ enum { TEGRA_VGPU_CMD_CHANNEL_FREE_HWPM_CTX = 47, TEGRA_VGPU_CMD_GR_CTX_ALLOC = 48, TEGRA_VGPU_CMD_GR_CTX_FREE = 49, - TEGRA_VGPU_CMD_CHANNEL_BIND_GR_CTX =50, + TEGRA_VGPU_CMD_CHANNEL_BIND_GR_CTX = 50, TEGRA_VGPU_CMD_TSG_BIND_GR_CTX = 51, TEGRA_VGPU_CMD_TSG_BIND_CHANNEL = 52, TEGRA_VGPU_CMD_TSG_UNBIND_CHANNEL = 53,