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>

4 files changed, 6 insertions, 1 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