8 files changed, 11 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/css_vgpu.c
index e0798475..6a0da7dc 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 <nvgpu/vgpu/vgpu_ivm.h>
-#include <linux/tegra_vgpu.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 #include <uapi/linux/nvgpu.h>
 
 #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 ec6fd875..90679cc7 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 <nvgpu/vgpu/vgpu_ivc.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 
-#include <linux/tegra_vgpu.h>
 #include <uapi/linux/nvgpu.h>
 
 #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 67a00c36..52a25893 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 <linux/string.h>
-#include <linux/tegra_vgpu.h>
 
 #include <uapi/linux/nvgpu.h>
 
@@ -24,6 +23,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/vgpu/vgpu_ivm.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 
 #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 af25e486..c2129e4b 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 <nvgpu/nvhost.h>
-
-#include <linux/tegra_vgpu.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 
 #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 a0099f03..5fbc7bbe 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 <linux/tegra_vgpu.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
 
 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 8b060b24..82a3db8f 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 <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/tegra_vgpu.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 #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 19987f0c..421763ec 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 <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/tegra_vgpu.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
 #include "gk20a/tsg_gk20a.h"
@@ -24,6 +22,7 @@
 #include "fifo_vgpu.h"
 
 #include <nvgpu/bug.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
 
 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 f59ad5bf..e9a73baf 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 <nvgpu/vgpu/vgpu_ivc.h>
+#include <nvgpu/vgpu/tegra_vgpu.h>
+#include <nvgpu/thread.h>
 
-#include <linux/tegra_vgpu.h>
 #include "gk20a/gk20a.h"
 #include "common/linux/platform_gk20a.h"
 #include "common/linux/os_linux.h"
 
-#include <nvgpu/thread.h>
-
 struct vgpu_priv_data {
         u64 virt_handle;
         struct nvgpu_thread intr_handler;