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/gv11b/acr_gv11b.c     | 2 +-
 drivers/gpu/nvgpu/gv11b/ce_gv11b.c      | 3 +--
 drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c  | 2 +-
 drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | 2 +-
 drivers/gpu/nvgpu/gv11b/ecc_gv11b.c     | 2 +-
 drivers/gpu/nvgpu/gv11b/fifo_gv11b.c    | 2 +-
 drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c  | 2 +-
 drivers/gpu/nvgpu/gv11b/gr_gv11b.c      | 2 +-
 drivers/gpu/nvgpu/gv11b/gv11b.c         | 2 +-
 drivers/gpu/nvgpu/gv11b/gv11b.h         | 2 +-
 drivers/gpu/nvgpu/gv11b/hal_gv11b.c     | 2 +-
 drivers/gpu/nvgpu/gv11b/mm_gv11b.c      | 2 +-
 drivers/gpu/nvgpu/gv11b/pmu_gv11b.c     | 3 +--
 drivers/gpu/nvgpu/gv11b/regops_gv11b.c  | 3 ++-
 drivers/gpu/nvgpu/gv11b/subctx_gv11b.c  | 6 +++---
 15 files changed, 18 insertions(+), 19 deletions(-)

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

diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
index e27c1760..c7b854bf 100644
--- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
@@ -33,8 +33,8 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "acr_gv11b.h"
 #include "pmu_gv11b.h"
 #include "gm20b/mm_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
index 0183aff0..2eea11df 100644
--- a/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ce_gv11b.c
@@ -25,8 +25,7 @@
 #include <nvgpu/io.h>
 #include "nvgpu/log.h"
 #include "nvgpu/bitops.h"
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "gp10b/ce_gp10b.h"
 
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
index 4707ab31..1191dad3 100644
--- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
@@ -35,9 +35,9 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
 #include "css_gr_gv11b.h"
 
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
index 85db7aea..ec6cce55 100644
--- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
@@ -25,8 +25,8 @@
 #include <nvgpu/log.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv11b/dbg_gpu_gv11b.h"
 #include <nvgpu/hw/gv11b/hw_perf_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
diff --git a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c
index 6e29bf94..07937042 100644
--- a/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ecc_gv11b.c
@@ -21,8 +21,8 @@
  */
 
 #include <nvgpu/ecc.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv11b/ecc_gv11b.h"
 
 int gv11b_ecc_init(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 4632d3f8..fa1836c8 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -39,9 +39,9 @@
 #include <nvgpu/ptimer.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 
 #include "gp10b/fifo_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
index 514aadb1..9ac54192 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.c
@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "gr_ctx_gv11b.h"
 
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 2596d400..78cb1b98 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -35,9 +35,9 @@
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
 #include <nvgpu/bitops.h>
+#include <nvgpu/gk20a.h>
 #include <nvgpu/channel.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/regops_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c
index 5d2bfbd7..db146095 100644
--- a/drivers/gpu/nvgpu/gv11b/gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gv11b.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/enabled.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gv11b/gv11b.h"
 
 int gv11b_init_gpu_characteristics(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.h b/drivers/gpu/nvgpu/gv11b/gv11b.h
index 3d5490e6..c6ecf141 100644
--- a/drivers/gpu/nvgpu/gv11b/gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gv11b.h
@@ -25,7 +25,7 @@
 #ifndef GV11B_H
 #define GV11B_H
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int gv11b_init_gpu_characteristics(struct gk20a *g);
 
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 91122fba..479b06d1 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -21,6 +21,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include <nvgpu/gk20a.h>
 
 #include "common/bus/bus_gk20a.h"
 #include "common/bus/bus_gp10b.h"
@@ -44,7 +45,6 @@
 #include "common/mc/mc_gp10b.h"
 #include "common/mc/mc_gv11b.h"
 
-#include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
 #include "gk20a/fecs_trace_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
index 5d5aed94..8027d165 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.c
@@ -27,8 +27,8 @@
 #include <nvgpu/log.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #include "gp10b/mm_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
index 60ffdb98..a9f183b1 100644
--- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
@@ -28,8 +28,7 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
 #include <nvgpu/utils.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 #include "gp10b/pmu_gp10b.h"
 #include "gp106/pmu_gp106.h"
diff --git a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c
index 0bc8ab05..13386a4a 100644
--- a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c
@@ -22,7 +22,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
+
 #include "gk20a/regops_gk20a.h"
 #include "regops_gv11b.h"
 
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index 25626cd4..499a00a8 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -22,9 +22,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/gk20a.h"
-
-#include "gv11b/subctx_gv11b.h"
+#include <nvgpu/gk20a.h>
 
 #include <nvgpu/dma.h>
 #include <nvgpu/log.h>
@@ -36,6 +34,8 @@
 #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
 
+#include "gv11b/subctx_gv11b.h"
+
 static void gv11b_subctx_commit_valid_mask(struct vm_gk20a *vm,
 				struct nvgpu_mem *inst_block);
 static void gv11b_subctx_commit_pdb(struct vm_gk20a *vm,
-- 
cgit v1.2.2