gpu: nvgpu: move platform_gk20a.h to linux

Move gk20a/platform_gk20a.h to linux specific directory as
common/linux/platform_gk20a.h since this file includes all linux specific
stuff

Fix #includes in all the files to include this file with correct path

Remove #include of this file where it is no more needed

Fix gk20a_init_sim_support() to receive struct gk20a as parameter
instead of receiving linux specific struct platform_device

NVGPU-316

Change-Id: I5ec08e776b753af4d39d11c11f6f068be2ac236f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1589938
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

37 files changed, 38 insertions, 40 deletions

diff --git a/drivers/gpu/nvgpu/common/as.c b/drivers/gpu/nvgpu/common/as.c
index 3fcc65fa..31cdd0b6 100644
--- a/drivers/gpu/nvgpu/common/as.c
+++ b/drivers/gpu/nvgpu/common/as.c
@@ -28,7 +28,6 @@
 #include <nvgpu/vm.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
 /* dumb allocator... */
 static int generate_as_share_id(struct gk20a_as *as)
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c
index 3f768867..a9888590 100644
--- a/drivers/gpu/nvgpu/common/linux/clk.c
+++ b/drivers/gpu/nvgpu/common/linux/clk.c
@@ -22,9 +22,9 @@
 
 #include "clk.h"
 #include "os_linux.h"
+#include "platform_gk20a.h"
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
 static unsigned long nvgpu_linux_clk_get_rate(struct gk20a *g, u32 api_domain)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c
index a4a07a4c..8268bf60 100644
--- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c
+++ b/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c
@@ -23,13 +23,13 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/barrier.h>
 
+#include "platform_gk20a.h"
 #include "os_linux.h"
 #include "ctxsw_trace.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c
index 08d0e679..7a4e4e9f 100644
--- a/drivers/gpu/nvgpu/common/linux/debug.c
+++ b/drivers/gpu/nvgpu/common/linux/debug.c
@@ -24,9 +24,9 @@
 #include "debug_hal.h"
 #include "debug_xve.h"
 #include "os_linux.h"
+#include "platform_gk20a.h"
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.c b/drivers/gpu/nvgpu/common/linux/debug_cde.c
index cbea83b9..f0afa6ee 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_cde.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_cde.c
@@ -13,7 +13,7 @@
  */
 
 #include "debug_cde.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "os_linux.h"
 
 #include <linux/debugfs.h>
diff --git a/drivers/gpu/nvgpu/common/linux/debug_clk.c b/drivers/gpu/nvgpu/common/linux/debug_clk.c
index 81839de7..2484d44b 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_clk.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_clk.c
@@ -16,9 +16,9 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
-#include "gk20a/platform_gk20a.h"
 #include "gm20b/clk_gm20b.h"
 #include "os_linux.h"
+#include "platform_gk20a.h"
 
 static int rate_get(void *data, u64 *val)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index 9e9d1007..5bac42e3 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -31,8 +31,8 @@
 #include <nvgpu/linux/vidmem.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
+#include "platform_gk20a.h"
 #include "os_linux.h"
 
 /*
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.c b/drivers/gpu/nvgpu/common/linux/dmabuf.c
index 2415b7c2..6b44ff55 100644
--- a/drivers/gpu/nvgpu/common/linux/dmabuf.c
+++ b/drivers/gpu/nvgpu/common/linux/dmabuf.c
@@ -25,8 +25,8 @@
 #include <nvgpu/linux/vidmem.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
+#include "platform_gk20a.h"
 #include "dmabuf.h"
 #include "os_linux.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c
index 759607a2..cdb28eaf 100644
--- a/drivers/gpu/nvgpu/common/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/common/linux/driver_common.c
@@ -25,7 +25,7 @@
 
 #include "scale.h"
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "module.h"
 #include "os_linux.h"
 #include "sysfs.h"
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c
index 44ff1507..a76165ff 100644
--- a/drivers/gpu/nvgpu/common/linux/firmware.c
+++ b/drivers/gpu/nvgpu/common/linux/firmware.c
@@ -21,7 +21,7 @@
 #include <nvgpu/firmware.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "os_linux.h"
 
 static const struct firmware *do_request_firmware(struct device *dev,
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/common/linux/ioctl.c
index c1053268..0aa7f6a3 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl.c
@@ -22,7 +22,6 @@
 #include <nvgpu/ctxsw_trace.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 
 #include "ioctl_channel.h"
@@ -33,6 +32,7 @@
 #include "module.h"
 #include "os_linux.h"
 #include "ctxsw_trace.h"
+#include "platform_gk20a.h"
 
 #define GK20A_NUM_CDEVS 7
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
index 18d0dd07..e566bfb4 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c
@@ -28,7 +28,7 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "ioctl_as.h"
 #include "os_linux.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 5b0c4a50..44f662cb 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -33,8 +33,8 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fence_gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
+#include "platform_gk20a.h"
 #include "ioctl_channel.h"
 #include "channel.h"
 #include "os_linux.h"
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 1442c19a..73911717 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -39,9 +39,9 @@
 #include "ioctl_tsg.h"
 #include "ioctl_channel.h"
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
+#include "platform_gk20a.h"
 #include "os_linux.h"
 #include "dmabuf.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c
index 24bf813a..f8bdd19b 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c
@@ -33,11 +33,11 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "os_linux.h"
+#include "platform_gk20a.h"
 #include "ioctl_dbg.h"
 
 
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
index 7eea636e..2570886d 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c
@@ -25,8 +25,8 @@
 #include <nvgpu/log.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/tsg_gk20a.h"
+#include "platform_gk20a.h"
 #include "ioctl_tsg.h"
 #include "ioctl_channel.h"
 #include "os_linux.h"
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c
index f371bb77..e120a3de 100644
--- a/drivers/gpu/nvgpu/common/linux/log.c
+++ b/drivers/gpu/nvgpu/common/linux/log.c
@@ -20,7 +20,7 @@
 #include <nvgpu/log.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "os_linux.h"
 
 /*
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 7706d826..4aff6a2d 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -33,7 +33,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/ctxsw_trace.h>
 
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "sysfs.h"
 #include "vgpu/vgpu.h"
 #include "scale.h"
@@ -661,7 +661,7 @@ static int gk20a_init_support(struct platform_device *dev)
                         goto fail;
                 }
 
-                err = gk20a_init_sim_support(dev);
+                err = gk20a_init_sim_support(g);
                 if (err)
                         goto fail;
         }
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 19483f86..118567e5 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -23,13 +23,13 @@
 #include <nvgpu/enabled.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "clk/clk.h"
 #include "clk/clk_mclk.h"
 #include "module.h"
 #include "intr.h"
 #include "sysfs.h"
 #include "os_linux.h"
+#include "platform_gk20a.h"
 
 #include "pci.h"
 #ifdef CONFIG_TEGRA_19x_GPU
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h
index d4ff17f3..348c9e24 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a.h
@@ -29,7 +29,7 @@
 
 #include <nvgpu/lock.h>
 
-#include "gk20a.h"
+#include "gk20a/gk20a.h"
 
 #define GK20A_CLKS_MAX          4
 
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index 2d6d156c..c40eafe4 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -47,10 +47,10 @@
 #include <nvgpu/linux/dma.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gm20b/clk_gm20b.h"
 
 #include "scale.h"
+#include "platform_gk20a.h"
 #include "clk.h"
 #include "os_linux.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
index 1f7a7694..b944844e 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
@@ -35,9 +35,9 @@
 
 #include "clk.h"
 
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/gk20a.h"
 
+#include "platform_gk20a.h"
 #include "platform_gk20a_tegra.h"
 #include "gp10b/platform_gp10b.h"
 #include "platform_gp10b_tegra.h"
diff --git a/drivers/gpu/nvgpu/common/linux/scale.c b/drivers/gpu/nvgpu/common/linux/scale.c
index 05f09dcc..84ac1cfd 100644
--- a/drivers/gpu/nvgpu/common/linux/scale.c
+++ b/drivers/gpu/nvgpu/common/linux/scale.c
@@ -27,7 +27,7 @@
 #include <nvgpu/log.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "scale.h"
 #include "os_linux.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.c b/drivers/gpu/nvgpu/common/linux/sysfs.c
index 6897fae8..b1e7d1ed 100644
--- a/drivers/gpu/nvgpu/common/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/common/linux/sysfs.c
@@ -23,7 +23,7 @@
 #include <nvgpu/nvhost.h>
 
 #include "sysfs.h"
-#include "gk20a/platform_gk20a.h"
+#include "platform_gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/common/linux/timers.c
index 5786b240..d0004aa5 100644
--- a/drivers/gpu/nvgpu/common/linux/timers.c
+++ b/drivers/gpu/nvgpu/common/linux/timers.c
@@ -21,7 +21,8 @@
 #include <nvgpu/soc.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+
+#include "platform_gk20a.h"
 
 /*
  * Returns 1 if the platform is pre-Si and should ignore the timeout checking.
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c
index bb337d97..d04ed5ed 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/common/linux/vm.c
@@ -32,8 +32,8 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/kind_gk20a.h"
-#include "gk20a/platform_gk20a.h"
 
+#include "platform_gk20a.h"
 #include "os_linux.h"
 #include "dmabuf.h"
 
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 802ccd76..f70cfdf8 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -29,7 +29,6 @@
 #include <nvgpu/mm.h>
 
 #include "gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gr_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 #include "regops_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index cb0c015e..d54e8d43 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -41,7 +41,6 @@
 #include <nvgpu/vidmem.h>
 
 #include "gk20a.h"
-#include "platform_gk20a.h"
 #include "mm_gk20a.h"
 #include "fence_gk20a.h"
 #include "kind_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c
index 90a37c47..6209188c 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_vgpu_tegra.c
@@ -23,7 +23,7 @@
  */
 
 #include "gk20a.h"
-#include "platform_gk20a.h"
+#include "common/linux/platform_gk20a.h"
 #include "vgpu/clk_vgpu.h"
 
 #include <nvgpu/nvhost.h>
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c
index 34ca5add..ab064710 100644
--- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c
@@ -28,7 +28,6 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a.h"
-#include "platform_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_sim_gk20a.h>
 
@@ -104,11 +103,9 @@ static int alloc_and_kmap_iopage(struct gk20a *g,
 
 }
 
-int gk20a_init_sim_support(struct platform_device *pdev)
+int gk20a_init_sim_support(struct gk20a *g)
 {
         int err = 0;
-        struct device *dev = &pdev->dev;
-        struct gk20a *g = get_gk20a(dev);
         u64 phys;
 
         /* allocate sim event/msg buffers */
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
index 17e508de..44378e7a 100644
--- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.h
@@ -45,7 +45,7 @@ struct sim_gk20a {
         void (*remove_support)(struct sim_gk20a *);
 };
 
-int gk20a_init_sim_support(struct platform_device *pdev);
+int gk20a_init_sim_support(struct gk20a *g);
 int gk20a_sim_esc_readl(struct gk20a *g, char *path, u32 index, u32 *data);
 
 #endif /*__SIM_GK20A_H__*/
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h
index daa0bb0b..e814ac70 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.h
@@ -26,6 +26,9 @@
 
 #include <nvgpu/lock.h>
 
+struct gk20a;
+struct clk_gk20a;
+
 struct nvgpu_clk_pll_debug_data {
         u32 trim_sys_sel_vco_reg;
         u32 trim_sys_sel_vco_val;
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
index afc92d66..6913c280 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
@@ -25,9 +25,9 @@
 #include <nvgpu/pmu.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gp106/bios_gp106.h"
 #include "common/linux/os_linux.h"
+#include "common/linux/platform_gk20a.h"
 
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
index 37fff2d4..5eade2e0 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -24,12 +24,12 @@
 #include <nvgpu/bug.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "pwrpolicy.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gp106/bios_gp106.h"
 #include "common/linux/os_linux.h"
+#include "common/linux/platform_gk20a.h"
 
 #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output
 #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0))
diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
index 266ce871..f45ccc60 100644
--- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
@@ -26,8 +26,8 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
+#include "common/linux/platform_gk20a.h"
 #include "vgpu.h"
 #include "css_vgpu.h"
 
diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
index 94d7140e..683317dc 100644
--- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c
@@ -24,8 +24,8 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gk20a/tsg_gk20a.h"
+#include "common/linux/platform_gk20a.h"
 #include "vgpu.h"
 #include "fifo_vgpu.h"
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h
index d5c49c0f..6ce61e92 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.h
@@ -28,7 +28,7 @@
 #include <linux/tegra_gr_comm.h>
 #include <linux/tegra_vgpu.h>
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "common/linux/platform_gk20a.h"
 #include "common/linux/os_linux.h"
 
 #include <nvgpu/thread.h>