From 421e64aad73c419495253c62b131677cf25c4924 Mon Sep 17 00:00:00 2001
From: Debarshi Dutta <ddutta@nvidia.com>
Date: Wed, 19 Sep 2018 11:46:27 +0530
Subject: gpu: nvgpu: move header location of gk20a.h

Update header path of gk20a.h in files present in common/
to <nvgpu/gk20a.h>

Jira NVGPU-597

Change-Id: I3431dae93ada9bd561454c89a0b99c5292ab4a8d
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1832024
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/mm/comptags.c        | 3 +--
 drivers/gpu/nvgpu/common/mm/gmmu.c            | 2 +-
 drivers/gpu/nvgpu/common/mm/mm.c              | 3 +--
 drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | 2 +-
 drivers/gpu/nvgpu/common/mm/nvgpu_mem.c       | 4 +---
 drivers/gpu/nvgpu/common/mm/pd_cache.c        | 2 +-
 drivers/gpu/nvgpu/common/mm/vidmem.c          | 2 +-
 drivers/gpu/nvgpu/common/mm/vm.c              | 3 +--
 drivers/gpu/nvgpu/common/mm/vm_area.c         | 2 +-
 9 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'drivers/gpu/nvgpu/common/mm')

diff --git a/drivers/gpu/nvgpu/common/mm/comptags.c b/drivers/gpu/nvgpu/common/mm/comptags.c
index f6216648..cb0184c7 100644
--- a/drivers/gpu/nvgpu/common/mm/comptags.c
+++ b/drivers/gpu/nvgpu/common/mm/comptags.c
@@ -23,8 +23,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/bitops.h>
 #include <nvgpu/comptags.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 int gk20a_comptaglines_alloc(struct gk20a_comptag_allocator *allocator,
 			     u32 *offset, u32 len)
diff --git a/drivers/gpu/nvgpu/common/mm/gmmu.c b/drivers/gpu/nvgpu/common/mm/gmmu.c
index 02e32b20..afbad75c 100644
--- a/drivers/gpu/nvgpu/common/mm/gmmu.c
+++ b/drivers/gpu/nvgpu/common/mm/gmmu.c
@@ -32,8 +32,8 @@
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/types.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #define __gmmu_dbg(g, attrs, fmt, args...)				\
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c
index 6c8f2cdf..58a435c0 100644
--- a/drivers/gpu/nvgpu/common/mm/mm.c
+++ b/drivers/gpu/nvgpu/common/mm/mm.c
@@ -29,8 +29,7 @@
 #include <nvgpu/semaphore.h>
 #include <nvgpu/pramin.h>
 #include <nvgpu/enabled.h>
-
-#include "gk20a/gk20a.h"
+#include <nvgpu/gk20a.h>
 
 /*
  * Attempt to find a reserved memory area to determine PTE size for the passed
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
index 68d68ad6..c49dcfd2 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
@@ -23,8 +23,8 @@
  */
 
 #include <nvgpu/allocator.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 u64 nvgpu_alloc_length(struct nvgpu_allocator *a)
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index 5cfaded0..8f6bd66e 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -25,9 +25,7 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/vidmem.h>
-
-#include "gk20a/gk20a.h"
-
+#include <nvgpu/gk20a.h>
 /*
  * Make sure to use the right coherency aperture if you use this function! This
  * will not add any checks. If you want to simply use the default coherency then
diff --git a/drivers/gpu/nvgpu/common/mm/pd_cache.c b/drivers/gpu/nvgpu/common/mm/pd_cache.c
index a8ed10e7..d9dc3db0 100644
--- a/drivers/gpu/nvgpu/common/mm/pd_cache.c
+++ b/drivers/gpu/nvgpu/common/mm/pd_cache.c
@@ -27,8 +27,8 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/list.h>
 #include <nvgpu/log2.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 #define pd_dbg(g, fmt, args...) nvgpu_log(g, gpu_dbg_pd_cache, fmt, ##args)
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index 3f5e0fbb..06cf053b 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -27,8 +27,8 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index 33587e5d..1e6c4601 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -34,10 +34,9 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/timers.h>
-
+#include <nvgpu/gk20a.h>
 #include <nvgpu/vgpu/vm.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 struct nvgpu_ctag_buffer_info {
diff --git a/drivers/gpu/nvgpu/common/mm/vm_area.c b/drivers/gpu/nvgpu/common/mm/vm_area.c
index ac4708af..363995fb 100644
--- a/drivers/gpu/nvgpu/common/mm/vm_area.c
+++ b/drivers/gpu/nvgpu/common/mm/vm_area.c
@@ -23,8 +23,8 @@
 #include <nvgpu/vm.h>
 #include <nvgpu/vm_area.h>
 #include <nvgpu/barrier.h>
+#include <nvgpu/gk20a.h>
 
-#include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
 struct nvgpu_vm_area *nvgpu_vm_area_find(struct vm_gk20a *vm, u64 addr)
-- 
cgit v1.2.2