gpu: nvgpu: Organize nvgpu_common.[ch]

Move nvgpu_common.c to drivers/gpu/nvgpu/common since it is a common
C file to all drivers.

Similarly move nvgpu_common.h to drivers/gpu/nvgpu/include/nvgpu since
this follows the new include guidelines.

Bug 1799159

Change-Id: I00ebed289973b27704c2cff073526e36505bf699
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1284612
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

13 files changed, 24 insertions, 18 deletions

diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu
index 9a061493..0f8f5bc1 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -31,7 +31,7 @@ nvgpu-y := \
         common/mm/buddy_allocator.o \
         common/mm/page_allocator.o \
         common/mm/lockless_allocator.o \
-        nvgpu_common.o \
+        common/nvgpu_common.o \
         gk20a/gk20a.o \
         gk20a/sched_gk20a.o \
         gk20a/as_gk20a.o \
diff --git a/drivers/gpu/nvgpu/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c
index 3e57c83d..80f1cca0 100644
--- a/drivers/gpu/nvgpu/nvgpu_common.c
+++ b/drivers/gpu/nvgpu/common/nvgpu_common.c
@@ -17,10 +17,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/firmware.h>
 
-#include "nvgpu_common.h"
 #include "gk20a/gk20a_scale.h"
 #include "gk20a/gk20a.h"
-#include "nvgpu_common.h"
+
+#include <nvgpu/nvgpu_common.h>
 
 #define EMC3D_DEFAULT_RATIO 750
 
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
index 384fbdef..b4a1f6f4 100644
--- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c
@@ -25,6 +25,7 @@
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/timers.h>
+#include <nvgpu/nvgpu_common.h>
 
 #include "gk20a.h"
 #include "channel_gk20a.h"
@@ -34,7 +35,6 @@
 #include "gr_gk20a.h"
 #include "debug_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index f3ccd613..ee6586ae 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -42,11 +42,11 @@
 #include <linux/sched.h>
 #include <linux/version.h>
 
+#include <nvgpu/nvgpu_common.h>
 #include <nvgpu/allocator.h>
 #include <nvgpu/timers.h>
 
 #include "gk20a.h"
-#include "nvgpu_common.h"
 #include "debug_gk20a.h"
 #include "ctrl_gk20a.h"
 #include "channel_sync_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
index e651ad2e..7342cb1d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c
@@ -3,7 +3,7 @@
  *
  * GK20A Graphics Context
  *
- * Copyright (c) 2011-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-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,
@@ -21,9 +21,10 @@
 
 #include <linux/firmware.h>
 
+#include <nvgpu/nvgpu_common.h>
+
 #include "gk20a.h"
 #include "gr_ctx_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_gr_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 5802cb68..cddb3316 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -32,6 +32,7 @@
 #include <trace/events/gk20a.h>
 
 #include <nvgpu/timers.h>
+#include <nvgpu/nvgpu_common.h>
 
 #include "gk20a.h"
 #include "kind_gk20a.h"
@@ -43,7 +44,6 @@
 #include "semaphore_gk20a.h"
 #include "platform_gk20a.h"
 #include "ctxsw_trace_gk20a.h"
-#include "nvgpu_common.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/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 0a2d36fe..9924e48f 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -24,12 +24,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 
+#include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
 #include "semaphore_gk20a.h"
-#include "nvgpu_common.h"
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.c b/drivers/gpu/nvgpu/gm206/acr_gm206.c
index 523f0c33..238114e3 100644
--- a/drivers/gpu/nvgpu/gm206/acr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/acr_gm206.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-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,
@@ -25,7 +25,8 @@
 
 #include "acr.h"
 #include "acr_gm206.h"
-#include "nvgpu_common.h"
+
+#include <nvgpu/nvgpu_common.h>
 
 #include <nvgpu/hw/gm206/hw_pwr_gm206.h>
 
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index fa736da5..a5551f42 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-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,
@@ -20,7 +20,8 @@
 #include "gm20b/fifo_gm20b.h"
 #include "fifo_gm206.h"
 #include "bios_gm206.h"
-#include "nvgpu_common.h"
+
+#include <nvgpu/nvgpu_common.h>
 
 #include <nvgpu/hw/gm206/hw_pwr_gm206.h>
 #include <nvgpu/hw/gm206/hw_mc_gm206.h>
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index e47bc773..060dc778 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -22,8 +22,7 @@
 #include <linux/platform/tegra/mc.h>
 
 #include <nvgpu/timers.h>
-
-#include "nvgpu_common.h"
+#include <nvgpu/nvgpu_common.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 308f1caf..9e844994 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -29,7 +29,8 @@
 
 #include "sec2_gp106.h"
 #include "nvgpu_gpuid_t18x.h"
-#include "nvgpu_common.h"
+
+#include <nvgpu/nvgpu_common.h>
 
 #include <nvgpu/hw/gp106/hw_psec_gp106.h>
 #include <nvgpu/hw/gp106/hw_pwr_gp106.h>
diff --git a/drivers/gpu/nvgpu/nvgpu_common.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h
index 85b4a3df..85b4a3df 100644
--- a/drivers/gpu/nvgpu/nvgpu_common.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h
diff --git a/drivers/gpu/nvgpu/pci.c b/drivers/gpu/nvgpu/pci.c
index 648fc60e..a81090a2 100644
--- a/drivers/gpu/nvgpu/pci.c
+++ b/drivers/gpu/nvgpu/pci.c
@@ -17,12 +17,15 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
-#include "pci.h"
-#include "nvgpu_common.h"
+
+#include <nvgpu/nvgpu_common.h>
+
 #include "gk20a/gk20a.h"
 #include "gk20a/platform_gk20a.h"
 #include "clk/clk.h"
 
+#include "pci.h"
+
 #define PCI_INTERFACE_NAME "card-%s%%s"
 
 static int nvgpu_pci_tegra_probe(struct device *dev)