From 34d552957dd0e3e3363067fc9b9af64281d29396 Mon Sep 17 00:00:00 2001
From: Konsta Holtta <kholtta@nvidia.com>
Date: Fri, 31 Aug 2018 12:59:37 +0300
Subject: gpu: nvgpu: move channel header to common

channel_gk20a is clear from chip specifics and from most dependencies,
so move it under the common directory.

Jira NVGPU-967

Change-Id: I41f2160b96d4ec84064288ecc22bb360e82352df
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1810578
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/os/linux/cde.c                     | 1 -
 drivers/gpu/nvgpu/os/linux/ctxsw_trace.c             | 1 +
 drivers/gpu/nvgpu/os/linux/debug_fifo.c              | 1 +
 drivers/gpu/nvgpu/os/linux/ioctl_as.c                | 1 +
 drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c              | 1 +
 drivers/gpu/nvgpu/os/linux/ioctl_dbg.c               | 1 +
 drivers/gpu/nvgpu/os/linux/ioctl_tsg.c               | 1 +
 drivers/gpu/nvgpu/os/linux/linux-channel.c           | 1 +
 drivers/gpu/nvgpu/os/linux/module.c                  | 1 +
 drivers/gpu/nvgpu/os/linux/os_fence_android.c        | 1 +
 drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c   | 1 +
 drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | 4 ++--
 drivers/gpu/nvgpu/os/linux/sync_sema_android.c       | 1 +
 drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c         | 2 +-
 drivers/gpu/nvgpu/os/posix/posix-channel.c           | 2 +-
 15 files changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c
index 30cd0bff..7aac8e01 100644
--- a/drivers/gpu/nvgpu/os/linux/cde.c
+++ b/drivers/gpu/nvgpu/os/linux/cde.c
@@ -38,7 +38,6 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/channel_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/fence_gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c
index 16b040da..aa5ed250 100644
--- a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c
+++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c
@@ -21,6 +21,7 @@
 #include <trace/events/gk20a.h>
 #include <uapi/linux/nvgpu.h>
 #include <nvgpu/ctxsw_trace.h>
+#include <nvgpu/channel.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/os/linux/debug_fifo.c b/drivers/gpu/nvgpu/os/linux/debug_fifo.c
index 2b5674c0..0c791a42 100644
--- a/drivers/gpu/nvgpu/os/linux/debug_fifo.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.c
@@ -20,6 +20,7 @@
 
 #include <nvgpu/sort.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/channel.h>
 
 void __gk20a_fifo_profile_free(struct nvgpu_ref *ref);
 
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c
index 7d1d618e..4e479e8e 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_as.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c
@@ -24,6 +24,7 @@
 #include <nvgpu/gmmu.h>
 #include <nvgpu/vm_area.h>
 #include <nvgpu/log2.h>
+#include <nvgpu/channel.h>
 
 #include <nvgpu/linux/vm.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
index 2f013029..19b4286d 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
@@ -31,6 +31,7 @@
 #include <nvgpu/sizes.h>
 #include <nvgpu/list.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/channel.h>
 
 #include "ioctl_ctrl.h"
 #include "ioctl_dbg.h"
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
index 3931ab12..e4e7394e 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
@@ -30,6 +30,7 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/cond.h>
 #include <nvgpu/utils.h>
+#include <nvgpu/channel.h>
 
 #include <nvgpu/linux/vm.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
index 6c68ca58..6dd96d6b 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
@@ -25,6 +25,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/channel.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/tsg_gk20a.h"
diff --git a/drivers/gpu/nvgpu/os/linux/linux-channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c
index fef44f2b..77c14b56 100644
--- a/drivers/gpu/nvgpu/os/linux/linux-channel.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c
@@ -18,6 +18,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/channel.h>
 
 /*
  * This is required for nvgpu_vm_find_buf() which is used in the tracing
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 55f55f00..85439b88 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -44,6 +44,7 @@
 #include <nvgpu/sim.h>
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/channel.h>
 
 #include "platform_gk20a.h"
 #include "sysfs.h"
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android.c b/drivers/gpu/nvgpu/os/linux/os_fence_android.c
index 9be8c6c0..297b3b20 100644
--- a/drivers/gpu/nvgpu/os/linux/os_fence_android.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android.c
@@ -16,6 +16,7 @@
 #include <nvgpu/types.h>
 #include <nvgpu/os_fence.h>
 #include <nvgpu/linux/os_fence_android.h>
+#include <nvgpu/channel.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c
index e7070612..ec3ccf0d 100644
--- a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c
@@ -20,6 +20,7 @@
 #include <nvgpu/os_fence.h>
 #include <nvgpu/linux/os_fence_android.h>
 #include <nvgpu/semaphore.h>
+#include <nvgpu/channel.h>
 
 #include "gk20a/channel_sync_gk20a.h"
 #include "gk20a/mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c
index 103ad243..b15dba19 100644
--- a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c
+++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c
@@ -22,9 +22,9 @@
 #include <nvgpu/linux/os_fence_android.h>
 #include <nvgpu/nvhost.h>
 #include <nvgpu/atomic.h>
+#include <nvgpu/channel.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/channel_gk20a.h"
 #include "gk20a/channel_sync_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 
@@ -120,4 +120,4 @@ int nvgpu_os_fence_syncpt_fdget(struct nvgpu_os_fence *fence_out,
 	nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence);
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c
index 9598f2df..50465d0c 100644
--- a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c
+++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c
@@ -25,6 +25,7 @@
 #include <nvgpu/semaphore.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/kref.h>
+#include <nvgpu/channel.h>
 #include "../linux/channel.h"
 
 #include "../drivers/staging/android/sync.h"
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index 33c067c6..5b7a5c07 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
@@ -31,12 +31,12 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/defaults.h>
 #include <nvgpu/ltc.h>
+#include <nvgpu/channel.h>
 
 #include "vgpu_linux.h"
 #include "vgpu/fecs_trace_vgpu.h"
 #include "clk_vgpu.h"
 #include "gk20a/tsg_gk20a.h"
-#include "gk20a/channel_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gm20b/hal_gm20b.h"
 
diff --git a/drivers/gpu/nvgpu/os/posix/posix-channel.c b/drivers/gpu/nvgpu/os/posix/posix-channel.c
index 05697159..5e10b1ee 100644
--- a/drivers/gpu/nvgpu/os/posix/posix-channel.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-channel.c
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "gk20a/channel_gk20a.h"
+#include <nvgpu/channel.h>
 
 u32 nvgpu_get_gpfifo_entry_size(void)
 {
-- 
cgit v1.2.2