From 032860d8de01ac3a3357a4758e7ee81bd418c48f Mon Sep 17 00:00:00 2001
From: Debarshi Dutta <ddutta@nvidia.com>
Date: Fri, 21 Sep 2018 12:18:46 +0530
Subject: gpu: nvgpu: move header location of gk20a.h

change the path of gk20a.h to <nvgpu/gk20a.h> for files in the
following directories.

gp106/
gv100/

Jira NVGPU-597

Change-Id: I098c12c34cdce764e6fca4ea1d16c5f8dee81026
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1836707
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/gp106/acr_gp106.c     | 3 +--
 drivers/gpu/nvgpu/gp106/bios_gp106.c    | 2 +-
 drivers/gpu/nvgpu/gp106/clk_arb_gp106.c | 2 +-
 drivers/gpu/nvgpu/gp106/clk_gp106.c     | 2 +-
 drivers/gpu/nvgpu/gp106/fifo_gp106.c    | 6 +++---
 drivers/gpu/nvgpu/gp106/flcn_gp106.c    | 3 ++-
 drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c  | 5 +++--
 drivers/gpu/nvgpu/gp106/gr_gp106.c      | 2 +-
 drivers/gpu/nvgpu/gp106/hal_gp106.c     | 2 +-
 drivers/gpu/nvgpu/gp106/mclk_gp106.c    | 2 +-
 drivers/gpu/nvgpu/gp106/pmu_gp106.c     | 2 +-
 drivers/gpu/nvgpu/gp106/regops_gp106.c  | 3 ++-
 drivers/gpu/nvgpu/gp106/sec2_gp106.c    | 2 +-
 drivers/gpu/nvgpu/gv100/bios_gv100.c    | 2 +-
 drivers/gpu/nvgpu/gv100/fifo_gv100.c    | 5 +++--
 drivers/gpu/nvgpu/gv100/flcn_gv100.c    | 2 +-
 drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c  | 4 ++--
 drivers/gpu/nvgpu/gv100/gr_gv100.c      | 2 +-
 drivers/gpu/nvgpu/gv100/gv100.h         | 4 ++--
 drivers/gpu/nvgpu/gv100/hal_gv100.c     | 2 +-
 drivers/gpu/nvgpu/gv100/mm_gv100.c      | 2 +-
 drivers/gpu/nvgpu/gv100/nvlink_gv100.c  | 2 +-
 drivers/gpu/nvgpu/gv100/perf_gv100.c    | 2 +-
 drivers/gpu/nvgpu/gv100/pmu_gv100.c     | 2 +-
 drivers/gpu/nvgpu/gv100/regops_gv100.c  | 3 ++-
 25 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index b1150e29..2a4ee6d5 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -29,8 +29,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "gm20b/mm_gm20b.h"
 #include "gm20b/acr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index 2c212ec0..f0db87ca 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -27,8 +27,8 @@
 #include <nvgpu/falcon.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
 #include "bios_gp106.h"
 #include "gp106/mclk_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
index 87fc6a1f..ce0c03b9 100644
--- a/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_arb_gp106.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 #include <nvgpu/clk_arb.h>
 
 #include "clk_arb_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index e892ceda..28aa999f 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -28,9 +28,9 @@
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/pmu.h>
+#include <nvgpu/gk20a.h>
 
 #include "clk/clk.h"
-#include "gk20a/gk20a.h"
 #include "gp106/mclk_gp106.h"
 
 #include "clk_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/fifo_gp106.c b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
index 8202426e..841238a9 100644
--- a/drivers/gpu/nvgpu/gp106/fifo_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
@@ -20,7 +20,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+#include <nvgpu/bug.h>
+
 #include "gp10b/fifo_gp10b.h"
 
 #include "fifo_gp106.h"
@@ -28,8 +30,6 @@
 #include <nvgpu/hw/gp106/hw_ccsr_gp106.h>
 #include <nvgpu/hw/gp106/hw_fifo_gp106.h>
 
-#include <nvgpu/bug.h>
-
 u32 gp106_fifo_get_num_fifos(struct gk20a *g)
 {
 	return ccsr_channel__size_1_v();
diff --git a/drivers/gpu/nvgpu/gp106/flcn_gp106.c b/drivers/gpu/nvgpu/gp106/flcn_gp106.c
index 8f649c26..94266d52 100644
--- a/drivers/gpu/nvgpu/gp106/flcn_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/flcn_gp106.c
@@ -19,7 +19,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gk20a/flcn_gk20a.h"
 #include "gp106/sec2_gp106.h"
 #include "gp106/flcn_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c
index 5dc0f591..ab381239 100644
--- a/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_ctx_gp106.c
@@ -1,7 +1,7 @@
 /*
  * GP106 Graphics Context
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gr_ctx_gp106.h"
 
 int gr_gp106_get_netlist_name(struct gk20a *g, int index, char *name)
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c
index a3fd8912..2de0ae87 100644
--- a/drivers/gpu/nvgpu/gp106/gr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/dma.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index e8ad68c2..c0f2fd57 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -43,7 +43,6 @@
 #include "common/mc/mc_gm20b.h"
 #include "common/mc/mc_gp10b.h"
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/mm_gk20a.h"
@@ -95,6 +94,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
 #include <nvgpu/hw/gp106/hw_proj_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index b4f553ec..f2aa7c47 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -26,8 +26,8 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include "os/linux/os_linux.h"
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index 3e4a7390..a95f05f0 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -24,8 +24,8 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
 #include "gm20b/acr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp106/regops_gp106.c b/drivers/gpu/nvgpu/gp106/regops_gp106.c
index 581b280d..30310486 100644
--- a/drivers/gpu/nvgpu/gp106/regops_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/regops_gp106.c
@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gk20a/regops_gk20a.h"
 #include "regops_gp106.h"
 
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
index 40823b69..37c9d4ac 100644
--- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
@@ -25,8 +25,8 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "sec2_gp106.h"
 
 #include <nvgpu/hw/gp106/hw_pwr_gp106.h>
diff --git a/drivers/gpu/nvgpu/gv100/bios_gv100.c b/drivers/gpu/nvgpu/gv100/bios_gv100.c
index a1a3d053..a97b9efb 100644
--- a/drivers/gpu/nvgpu/gv100/bios_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/bios_gv100.c
@@ -24,8 +24,8 @@
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gp106/bios_gp106.h"
 #include "bios_gv100.h"
 
diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
index 1dedb7d4..0b5515f2 100644
--- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
@@ -22,11 +22,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-#include "fifo_gv100.h"
 #include <nvgpu/timers.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
+
+#include "fifo_gv100.h"
 
 #include <nvgpu/hw/gv100/hw_ccsr_gv100.h>
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gv100/flcn_gv100.c b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
index 900d9204..1c3a0a67 100644
--- a/drivers/gpu/nvgpu/gv100/flcn_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/flcn_gv100.c
@@ -21,8 +21,8 @@
  */
 #include <nvgpu/falcon.h>
 #include <nvgpu/pmu.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/flcn_gk20a.h"
 #include "gp106/flcn_gp106.h"
 #include "gv100/flcn_gv100.h"
diff --git a/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c b/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c
index 8b50125e..06dd2088 100644
--- a/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/gr_ctx_gv100.c
@@ -1,7 +1,7 @@
 /*
  * GV100 Graphics Context
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -21,8 +21,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gr_ctx_gv100.h"
 
 int gr_gv100_get_netlist_name(struct gk20a *g, int index, char *name)
diff --git a/drivers/gpu/nvgpu/gv100/gr_gv100.c b/drivers/gpu/nvgpu/gv100/gr_gv100.c
index d5ace998..0d5692e1 100644
--- a/drivers/gpu/nvgpu/gv100/gr_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/gr_gv100.c
@@ -26,8 +26,8 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/gr_pri_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gv100/gv100.h b/drivers/gpu/nvgpu/gv100/gv100.h
index 7cc1f77b..42862251 100644
--- a/drivers/gpu/nvgpu/gv100/gv100.h
+++ b/drivers/gpu/nvgpu/gv100/gv100.h
@@ -1,7 +1,7 @@
 /*
  * GV100 Graphics
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,7 @@
 #ifndef GV100_H
 #define GV100_H
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int gv100_init_gpu_characteristics(struct gk20a *g);
 
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 6d37f4a2..26584bb4 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -50,7 +50,6 @@
 #include "common/mc/mc_gv11b.h"
 #include "common/mc/mc_gv100.h"
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
@@ -115,6 +114,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
 #include <nvgpu/hw/gv100/hw_proj_gv100.h>
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.c b/drivers/gpu/nvgpu/gv100/mm_gv100.c
index 77a0ac4d..43bff760 100644
--- a/drivers/gpu/nvgpu/gv100/mm_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/mm_gv100.c
@@ -24,8 +24,8 @@
 
 #include <nvgpu/sizes.h>
 #include <nvgpu/io.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv100/mm_gv100.h"
 
 u32 gv100_mm_get_flush_retries(struct gk20a *g, enum nvgpu_flush_op op)
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index 7457c181..7bbac293 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -31,8 +31,8 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "nvlink_gv100.h"
 
 #include <nvgpu/hw/gv100/hw_top_gv100.h>
diff --git a/drivers/gpu/nvgpu/gv100/perf_gv100.c b/drivers/gpu/nvgpu/gv100/perf_gv100.c
index f3ba78ba..ea4c3662 100644
--- a/drivers/gpu/nvgpu/gv100/perf_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/perf_gv100.c
@@ -24,8 +24,8 @@
 
 #include <nvgpu/pmu.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv100/perf_gv100.h"
 
 static int pmu_set_boot_clk_runcb_fn(void *arg)
diff --git a/drivers/gpu/nvgpu/gv100/pmu_gv100.c b/drivers/gpu/nvgpu/gv100/pmu_gv100.c
index 9317f6b4..22f50f57 100644
--- a/drivers/gpu/nvgpu/gv100/pmu_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/pmu_gv100.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/pmu.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv100/pmu_gv100.h"
 
 int gv100_pmu_init_acr(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gv100/regops_gv100.c b/drivers/gpu/nvgpu/gv100/regops_gv100.c
index baf57c78..7d4da938 100644
--- a/drivers/gpu/nvgpu/gv100/regops_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/regops_gv100.c
@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gk20a/regops_gk20a.h"
 #include "regops_gv100.h"
 
-- 
cgit v1.2.2