gpu: nvgpu: clean up channel header includes

Remove a few unnecessary includes from channel_gk20a.h and add them to c
files where needed.

Jira NVGPU-967

Change-Id: Ic38132c776a56b6966424806faab7871575b6c10
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1804609
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>

10 files changed, 14 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/common/ce2.c b/drivers/gpu/nvgpu/common/ce2.c
index d4793ef6..342f046c 100644
--- a/drivers/gpu/nvgpu/common/ce2.c
+++ b/drivers/gpu/nvgpu/common/ce2.c
@@ -26,8 +26,9 @@
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
-#include "gk20a/ce2_gk20a.h"
 #include "gk20a/gk20a.h"
+#include "gk20a/ce2_gk20a.h"
+#include "gk20a/fence_gk20a.h"
 
 static inline int gk20a_get_valid_launch_flags(struct gk20a *g, int launch_flags)
 {
diff --git a/drivers/gpu/nvgpu/common/fifo/channel.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 5966e191..7a496ea1 100644
--- a/drivers/gpu/nvgpu/common/fifo/channel.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -47,6 +47,7 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fence_gk20a.h"
+#include "gk20a/channel_sync_gk20a.h"
 
 static void free_channel(struct fifo_gk20a *f, struct channel_gk20a *c);
 static void gk20a_channel_dump_ref_actions(struct channel_gk20a *c);
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index 47b086f7..e0f31233 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -29,6 +29,8 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
+#include "gk20a/fence_gk20a.h"
+#include "gk20a/channel_sync_gk20a.h"
 
 #include <trace/events/gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index febf6830..28a46ff0 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -30,6 +30,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
+#include "gk20a/fence_gk20a.h"
 
 /*
  * This is expected to be called from the shutdown path (or the error path in
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index 0248b0ca..f905243e 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -31,6 +31,7 @@
 #include <nvgpu/utils.h>
 
 #include "gk20a.h"
+#include "gk20a/fence_gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index 7c3d950b..a6e0d31a 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -30,16 +30,13 @@
 #include <nvgpu/cond.h>
 #include <nvgpu/atomic.h>
 
+#include "gr_gk20a.h"
+
 struct gk20a;
 struct dbg_session_gk20a;
 struct gk20a_fence;
 struct fifo_profile_gk20a;
-
-#include "channel_sync_gk20a.h"
-
-#include "mm_gk20a.h"
-#include "gr_gk20a.h"
-#include "fence_gk20a.h"
+struct gk20a_channel_sync;
 
 /* Flags to be passed to gk20a_channel_alloc_gpfifo() */
 #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR                  (1U << 0U)
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
index 77030c94..3ff1b088 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h
@@ -31,6 +31,7 @@
 
 struct gk20a_debug_output;
 struct mmu_fault_info;
+struct nvgpu_semaphore;
 
 enum {
         NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_LOW = 0,
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index 6b139862..011d5f17 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -33,6 +33,7 @@
 
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
+#include "gk20a/channel_sync_gk20a.h"
 
 #include <nvgpu/hw/gp10b/hw_pbdma_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ccsr_gp10b.h>
diff --git a/drivers/gpu/nvgpu/os/linux/dmabuf.c b/drivers/gpu/nvgpu/os/linux/dmabuf.c
index 6f07e88a..591c7c0a 100644
--- a/drivers/gpu/nvgpu/os/linux/dmabuf.c
+++ b/drivers/gpu/nvgpu/os/linux/dmabuf.c
@@ -24,6 +24,7 @@
 #include <nvgpu/linux/vm.h>
 
 #include "gk20a/gk20a.h"
+#include "gk20a/fence_gk20a.h"
 
 #include "platform_gk20a.h"
 #include "dmabuf.h"
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
index 7b003b76..e9a24923 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c
@@ -39,6 +39,7 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fence_gk20a.h"
+#include "gk20a/channel_sync_gk20a.h"
 
 #include "platform_gk20a.h"
 #include "ioctl_channel.h"