From cba424539d39ea184157f80b64938cfa31bc3924 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Sun, 2 Jul 2017 12:30:20 -0700
Subject: gpu: nvgpu: Move dev field from gk20a to nvgpu_os_linux

Move field "struct device *dev" from struct gk20a to struct
nvgpu_os_linux. The field is valid only for Linux.

JIRA NVGPU-38

Change-Id: I09286aa3a9c5a2406e5a27c1fbf21b2c515b4dd4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master/r/1514162
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/clk/clk_arb.c                       | 1 +
 drivers/gpu/nvgpu/common/linux/clk.c                  | 2 ++
 drivers/gpu/nvgpu/common/linux/debug.c                | 1 +
 drivers/gpu/nvgpu/common/linux/debug_allocator.c      | 1 +
 drivers/gpu/nvgpu/common/linux/debug_cde.c            | 1 +
 drivers/gpu/nvgpu/common/linux/debug_ce.c             | 1 +
 drivers/gpu/nvgpu/common/linux/debug_clk.c            | 1 +
 drivers/gpu/nvgpu/common/linux/debug_fifo.c           | 1 +
 drivers/gpu/nvgpu/common/linux/debug_gr.c             | 1 +
 drivers/gpu/nvgpu/common/linux/debug_mm.c             | 1 +
 drivers/gpu/nvgpu/common/linux/debug_pmu.c            | 1 +
 drivers/gpu/nvgpu/common/linux/debug_sched.c          | 1 +
 drivers/gpu/nvgpu/common/linux/dma.c                  | 1 +
 drivers/gpu/nvgpu/common/linux/firmware.c             | 1 +
 drivers/gpu/nvgpu/common/linux/log.c                  | 1 +
 drivers/gpu/nvgpu/common/linux/module.c               | 2 +-
 drivers/gpu/nvgpu/common/linux/nvhost.c               | 2 +-
 drivers/gpu/nvgpu/common/linux/os_linux.h             | 6 ++++++
 drivers/gpu/nvgpu/common/linux/pci.c                  | 3 ++-
 drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | 1 +
 drivers/gpu/nvgpu/common/linux/vm.c                   | 1 +
 drivers/gpu/nvgpu/gk20a/cde_gk20a.c                   | 2 +-
 drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c            | 1 +
 drivers/gpu/nvgpu/gk20a/gk20a.h                       | 1 -
 drivers/gpu/nvgpu/gk20a/gr_gk20a.c                    | 2 +-
 drivers/gpu/nvgpu/gk20a/mm_gk20a.c                    | 1 +
 drivers/gpu/nvgpu/gk20a/platform_gk20a.h              | 4 ----
 drivers/gpu/nvgpu/gm206/bios_gm206.c                  | 1 +
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c                    | 2 +-
 drivers/gpu/nvgpu/gp106/clk_gp106.c                   | 1 +
 drivers/gpu/nvgpu/gp106/mclk_gp106.c                  | 1 +
 drivers/gpu/nvgpu/gp106/therm_gp106.c                 | 1 +
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c                    | 2 +-
 drivers/gpu/nvgpu/gp10b/mm_gp10b.c                    | 2 +-
 drivers/gpu/nvgpu/pmgr/pmgr.c                         | 1 +
 drivers/gpu/nvgpu/pmgr/pmgrpmu.c                      | 1 +
 drivers/gpu/nvgpu/pmgr/pwrpolicy.c                    | 1 +
 drivers/gpu/nvgpu/vgpu/vgpu.c                         | 2 +-
 drivers/gpu/nvgpu/vgpu/vgpu.h                         | 1 +
 39 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index 05180a38..2cb7a42a 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -33,6 +33,7 @@
 
 #ifdef CONFIG_DEBUG_FS
 #include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 #endif
 
 #define MAX_F_POINTS 256
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c
index f24445b3..892b892a 100644
--- a/drivers/gpu/nvgpu/common/linux/clk.c
+++ b/drivers/gpu/nvgpu/common/linux/clk.c
@@ -22,6 +22,8 @@
 #include <soc/tegra/tegra-dvfs.h>
 
 #include "clk.h"
+#include "os_linux.h"
+
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c
index 9fd09efe..f24c6ae7 100644
--- a/drivers/gpu/nvgpu/common/linux/debug.c
+++ b/drivers/gpu/nvgpu/common/linux/debug.c
@@ -21,6 +21,7 @@
 #include "debug_kmem.h"
 #include "debug_pmu.h"
 #include "debug_sched.h"
+#include "os_linux.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.c b/drivers/gpu/nvgpu/common/linux/debug_allocator.c
index 9102b989..dfc1dc41 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_allocator.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_allocator.c
@@ -14,6 +14,7 @@
 
 #include "debug_allocator.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.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 d3aab3cd..8fcc6e84 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_cde.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_cde.c
@@ -14,6 +14,7 @@
 
 #include "debug_cde.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/debug_ce.c b/drivers/gpu/nvgpu/common/linux/debug_ce.c
index 95f0d2ad..1c2d4170 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_ce.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_ce.c
@@ -14,6 +14,7 @@
 
 #include "debug_ce.h"
 #include "gk20a/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 5bbe4127..8ffba3c8 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_clk.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_clk.c
@@ -18,6 +18,7 @@
 
 #include "gk20a/platform_gk20a.h"
 #include "gm20b/clk_gm20b.h"
+#include "os_linux.h"
 
 static int rate_get(void *data, u64 *val)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/common/linux/debug_fifo.c
index 1fba1868..1245c093 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_fifo.c
@@ -14,6 +14,7 @@
 
 #include "debug_fifo.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/nvgpu/common/linux/debug_gr.c b/drivers/gpu/nvgpu/common/linux/debug_gr.c
index 1045fe0b..732c2a7e 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_gr.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_gr.c
@@ -14,6 +14,7 @@
 
 #include "debug_gr.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/debug_mm.c b/drivers/gpu/nvgpu/common/linux/debug_mm.c
index dcb83112..bed8d10b 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_mm.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_mm.c
@@ -14,6 +14,7 @@
 
 #include "debug_mm.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 
diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.c b/drivers/gpu/nvgpu/common/linux/debug_pmu.c
index 8c3607b5..1c0b2520 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_pmu.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_pmu.c
@@ -15,6 +15,7 @@
 #include <nvgpu/enabled.h>
 #include "debug_pmu.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/nvgpu/common/linux/debug_sched.c b/drivers/gpu/nvgpu/common/linux/debug_sched.c
index 73fb890f..c0dcf8d9 100644
--- a/drivers/gpu/nvgpu/common/linux/debug_sched.c
+++ b/drivers/gpu/nvgpu/common/linux/debug_sched.c
@@ -14,6 +14,7 @@
 
 #include "debug_sched.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c
index 5fee878a..6473aed9 100644
--- a/drivers/gpu/nvgpu/common/linux/dma.c
+++ b/drivers/gpu/nvgpu/common/linux/dma.c
@@ -27,6 +27,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 #if defined(CONFIG_GK20A_VIDMEM)
 static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, dma_addr_t at,
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c
index 549e83ae..b49bc4a3 100644
--- a/drivers/gpu/nvgpu/common/linux/firmware.c
+++ b/drivers/gpu/nvgpu/common/linux/firmware.c
@@ -22,6 +22,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 static const struct firmware *do_request_firmware(struct device *dev,
 		const char *prefix, const char *fw_name, int flags)
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c
index 9883acfc..e2cebee8 100644
--- a/drivers/gpu/nvgpu/common/linux/log.c
+++ b/drivers/gpu/nvgpu/common/linux/log.c
@@ -21,6 +21,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 /*
  * Define a length for log buffers. This is the buffer that the 'fmt, ...' part
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 0b5dfec8..2f6dd4c7 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -865,7 +865,7 @@ static int gk20a_probe(struct platform_device *dev)
 
 	gk20a = &l->g;
 	set_gk20a(dev, gk20a);
-	gk20a->dev = &dev->dev;
+	l->dev = &dev->dev;
 	gk20a->log_mask = NVGPU_DEFAULT_DBG_MASK;
 
 	nvgpu_kmem_init(gk20a);
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/common/linux/nvhost.c
index 8e337529..611351ae 100644
--- a/drivers/gpu/nvgpu/common/linux/nvhost.c
+++ b/drivers/gpu/nvgpu/common/linux/nvhost.c
@@ -23,7 +23,7 @@
 #include "nvhost_priv.h"
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "os_linux.h"
 
 int nvgpu_get_nvhost_dev(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/common/linux/os_linux.h b/drivers/gpu/nvgpu/common/linux/os_linux.h
index e39d3c4d..cf012acc 100644
--- a/drivers/gpu/nvgpu/common/linux/os_linux.h
+++ b/drivers/gpu/nvgpu/common/linux/os_linux.h
@@ -22,6 +22,7 @@
 
 struct nvgpu_os_linux {
 	struct gk20a g;
+	struct device *dev;
 
 	struct {
 		struct cdev cdev;
@@ -75,6 +76,11 @@ static inline struct nvgpu_os_linux *nvgpu_os_linux_from_gk20a(struct gk20a *g)
 	return container_of(g, struct nvgpu_os_linux, g);
 }
 
+static inline struct device *dev_from_gk20a(struct gk20a *g)
+{
+	return nvgpu_os_linux_from_gk20a(g)->dev;
+}
+
 #define INTERFACE_NAME "nvhost%s-gpu"
 
 #endif
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 15435934..3a452d18 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -29,6 +29,7 @@
 #include "module.h"
 #include "intr.h"
 #include "sysfs.h"
+#include "os_linux.h"
 
 #include "pci.h"
 
@@ -367,7 +368,7 @@ static int nvgpu_pci_probe(struct pci_dev *pdev,
 	}
 
 	platform->g = g;
-	g->dev = &pdev->dev;
+	l->dev = &pdev->dev;
 
 	err = pci_enable_device(pdev);
 	if (err)
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
index 000e9eee..a28f1094 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
@@ -52,6 +52,7 @@
 #include "gm20b/clk_gm20b.h"
 
 #include "clk.h"
+#include "os_linux.h"
 
 #include "../../../arch/arm/mach-tegra/iomap.h"
 
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c
index cbacbdc0..d47d6bb1 100644
--- a/drivers/gpu/nvgpu/common/linux/vm.c
+++ b/drivers/gpu/nvgpu/common/linux/vm.c
@@ -29,6 +29,7 @@
 #include "gk20a/platform_gk20a.h"
 
 #include "vm_priv.h"
+#include "os_linux.h"
 
 static struct nvgpu_mapped_buf *__nvgpu_vm_find_mapped_buf_reverse(
 	struct vm_gk20a *vm, struct dma_buf *dmabuf, u32 kind)
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 0413ae6a..506207f2 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -37,7 +37,7 @@
 #include "cde_gk20a.h"
 #include "fence_gk20a.h"
 #include "gr_gk20a.h"
-#include "platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index aca9df75..0b26f657 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -28,6 +28,7 @@
 #include "gk20a.h"
 #include "gr_gk20a.h"
 #include "platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/log.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index dd5f0d17..90d3338a 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1019,7 +1019,6 @@ struct nvgpu_bios {
 };
 
 struct gk20a {
-	struct device *dev;
 	struct nvgpu_nvhost_dev *nvhost_dev;
 
 	/*
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 4dfb6ee8..d853c4f0 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -39,7 +39,7 @@
 #include "regops_gk20a.h"
 #include "dbg_gpu_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
-#include "platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 759e6a2b..d984d1f9 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -49,6 +49,7 @@
 #include "fence_gk20a.h"
 #include "kind_gk20a.h"
 #include "bus_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_ram_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
index 81402ad0..17c3f9a4 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h
@@ -259,10 +259,6 @@ static inline struct gk20a *get_gk20a(struct device *dev)
 {
 	return gk20a_get_platform(dev)->g;
 }
-static inline struct device *dev_from_gk20a(struct gk20a *g)
-{
-	return g->dev;
-}
 static inline struct gk20a *gk20a_from_dev(struct device *dev)
 {
 	if (!dev)
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index 9407bf3a..476affa0 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -25,6 +25,7 @@
 #include "gm20b/fifo_gm20b.h"
 #include "bios_gm206.h"
 #include "gp106/mclk_gp106.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/hw/gm206/hw_pwr_gm206.h>
 #include <nvgpu/hw/gm206/hw_mc_gm206.h>
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 90046232..1ff295c2 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -23,7 +23,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include "gr_gm20b.h"
 #include "pmu_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 332ad413..e9aec7ac 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -26,6 +26,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include "gk20a/platform_gk20a.h"
 #endif
+#include "common/linux/os_linux.h"
 
 #include "clk_gp106.h"
 #include "clk/clk_arb.h"
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index 283847a9..47ba4ea9 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -19,6 +19,7 @@
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
 #include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 #endif
 #include "gp106/mclk_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index 1781a17f..dacebe93 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -17,6 +17,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 #endif
 
 #include <nvgpu/hw/gp106/hw_therm_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 4ff306e0..d9d045bd 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -28,7 +28,7 @@
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/regops_gk20a.h"
-#include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
index 612d59f7..1ac778e0 100644
--- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
@@ -17,10 +17,10 @@
 #include <nvgpu/gmmu.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/platform_gk20a.h"
 #include "gm20b/mm_gm20b.h"
 #include "mm_gp10b.h"
 #include "rpfb_gp10b.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/hw/gp10b/hw_fb_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ram_gp10b.h>
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c
index 1b004832..b1c9ef79 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgr.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgr.c
@@ -18,6 +18,7 @@
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 #endif
 
 int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val)
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
index 803b1bc0..eda296df 100644
--- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
+++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c
@@ -18,6 +18,7 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
 #include "gm206/bios_gm206.h"
+#include "common/linux/os_linux.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 3c3c7a96..970d9953 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c
@@ -20,6 +20,7 @@
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 #include "gm206/bios_gm206.h"
+#include "common/linux/os_linux.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/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index bd52dc0a..c8929e93 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -677,7 +677,7 @@ int vgpu_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	gk20a->dev = dev;
+	l->dev = dev;
 	if (tegra_platform_is_linsim() || tegra_platform_is_vdk())
 		__nvgpu_set_enabled(gk20a, NVGPU_IS_FMODEL, true);
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h
index 92b82ac4..cee81bb1 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.h
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.h
@@ -20,6 +20,7 @@
 #include <linux/tegra_vgpu.h>
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
+#include "common/linux/os_linux.h"
 
 #include <nvgpu/thread.h>
 
-- 
cgit v1.2.2