From 8381eeea4f9b4717854387068ddf9244973e7d0d Mon Sep 17 00:00:00 2001
From: ddutta <ddutta@nvidia.com>
Date: Fri, 14 Sep 2018 16:50:24 +0530
Subject: gpu: nvgpu: change location of gk20a.h#include <nvgpu/gk20a.h>

Update the include location of gk20a.h to include/nvgpu/gk20a.h in the
following directories.

nvgpu/gm20b/
nvgpu/gp10b/
nvgpu/gv11b/

Jira NVGPU-597

Change-Id: Ie38d4a72bb65c41bd30058350509bfa7e87bb64e
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1822789
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/gm20b/acr_gm20b.c    |  2 +-
 drivers/gpu/nvgpu/gm20b/clk_gm20b.c    |  6 +++---
 drivers/gpu/nvgpu/gm20b/fifo_gm20b.c   | 10 +++++-----
 drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c |  3 ++-
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c     |  2 +-
 drivers/gpu/nvgpu/gm20b/hal_gm20b.c    | 15 +++++++--------
 drivers/gpu/nvgpu/gm20b/mm_gm20b.c     |  3 +--
 drivers/gpu/nvgpu/gm20b/pmu_gm20b.c    |  2 +-
 drivers/gpu/nvgpu/gm20b/regops_gm20b.c |  3 ++-
 9 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'drivers/gpu/nvgpu/gm20b')

diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 24112dd3..be05a8a8 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -35,8 +35,8 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "mm_gm20b.h"
 #include "acr_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index d2260d9c..31a14c0c 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -22,9 +22,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-#include "clk_gm20b.h"
-
 #include <nvgpu/soc.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/bug.h>
@@ -33,6 +30,9 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
+
+#include "clk_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_trim_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_therm_gm20b.h>
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index 19653541..f866b6bb 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -22,11 +22,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-#include "gk20a/fifo_gk20a.h"
-
-#include "fifo_gm20b.h"
-
 #include <nvgpu/timers.h>
 #include <nvgpu/log.h>
 #include <nvgpu/atomic.h>
@@ -35,8 +30,13 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
+#include "gk20a/fifo_gk20a.h"
+
+#include "fifo_gm20b.h"
+
 #include <nvgpu/hw/gm20b/hw_ccsr_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ram_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h>
diff --git a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c
index cd7433b3..8c9c4c92 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_ctx_gm20b.c
@@ -24,7 +24,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gr_ctx_gm20b.h"
 
 int gr_gm20b_get_netlist_name(struct gk20a *g, int index, char *name)
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 32e98e53..200f58a3 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -29,9 +29,9 @@
 #include <nvgpu/fuse.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
 #include "gr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index f863aa72..772a4a85 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -21,6 +21,13 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <nvgpu/debug.h>
+#include <nvgpu/bug.h>
+#include <nvgpu/enabled.h>
+#include <nvgpu/ptimer.h>
+#include <nvgpu/error_notifier.h>
+#include <nvgpu/gk20a.h>
+#include <nvgpu/channel.h>
 
 #include "common/clock_gating/gm20b_gating_reglist.h"
 #include "common/bus/bus_gm20b.h"
@@ -34,7 +41,6 @@
 #include "common/fuse/fuse_gm20b.h"
 #include "common/mc/mc_gm20b.h"
 
-#include "gk20a/gk20a.h"
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -56,13 +62,6 @@
 #include "hal_gm20b.h"
 #include "acr_gm20b.h"
 
-#include <nvgpu/debug.h>
-#include <nvgpu/bug.h>
-#include <nvgpu/enabled.h>
-#include <nvgpu/ptimer.h>
-#include <nvgpu/error_notifier.h>
-#include <nvgpu/channel.h>
-
 #include <nvgpu/hw/gm20b/hw_proj_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_fifo_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ram_gm20b.h>
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
index dbaaacc5..23dec6c0 100644
--- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c
@@ -23,8 +23,7 @@
  */
 
 #include <nvgpu/sizes.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "mm_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
index a46f8807..c1ec4d8e 100644
--- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
@@ -27,8 +27,8 @@
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
 #include "acr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
index ab865b68..2a74ab73 100644
--- a/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/regops_gm20b.c
@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gk20a/regops_gk20a.h"
 #include "regops_gm20b.h"
 
-- 
cgit v1.2.2