gpu: nvgpu: move channel code to common

Do a simple rename of channel_gk20a.c to common/fifo/channel.c. Header
cleanup and the like will soon follow. Also rename the os-specific files
to have unique names across directories because tmake requires that.

Jira NVGPU-967

Change-Id: I302bbbbe29735264e832378d444a176a4023e3e1
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1804608
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index c7ccefb5..a6f0f0ce 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -74,7 +74,7 @@ nvgpu-y += \
         os/linux/comptags.o \
         os/linux/dmabuf.o \
         os/linux/sched.o \
-        os/linux/channel.o \
+        os/linux/linux-channel.o \
         os/linux/sim.o \
         os/linux/sim_pci.o \
         os/linux/os_sched.o \
@@ -200,13 +200,13 @@ nvgpu-y += \
         common/clock_gating/gv11b_gating_reglist.o \
         common/sim.o \
         common/sim_pci.o \
+        common/fifo/channel.o \
         common/fifo/submit.o \
         common/ecc.o \
         common/ce2.o \
         gk20a/gk20a.o \
         gk20a/ce2_gk20a.o \
         gk20a/fifo_gk20a.o \
-        gk20a/channel_gk20a.o \
         gk20a/channel_sync_gk20a.o \
         gk20a/dbg_gpu_gk20a.o \
         gk20a/regops_gk20a.o \
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 503e0f3a..f1ba7f76 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -39,7 +39,7 @@ srcs :=	os/posix/nvgpu.c \
         os/posix/error_notifier.c \
         os/posix/fuse.c \
         os/posix/clk_arb.c \
-        os/posix/channel.c \
+        os/posix/posix-channel.c \
         os/posix/tsg.c \
         os/posix/nvlink.c \
         os/posix/lock.c \
@@ -104,6 +104,7 @@ srcs :=	os/posix/nvgpu.c \
         common/clock_gating/gv11b_gating_reglist.c \
         common/clock_gating/gp106_gating_reglist.c \
         common/clock_gating/gv100_gating_reglist.c \
+        common/fifo/channel.c \
         common/fifo/submit.c \
         boardobj/boardobj.c \
         boardobj/boardobjgrp.c \
@@ -140,7 +141,6 @@ srcs :=	os/posix/nvgpu.c \
         common/ptimer/ptimer_gk20a.c \
         gk20a/ce2_gk20a.c \
         gk20a/fifo_gk20a.c \
-        gk20a/channel_gk20a.c \
         gk20a/channel_sync_gk20a.c \
         gk20a/dbg_gpu_gk20a.c \
         gk20a/regops_gk20a.c \
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/common/fifo/channel.c
index 77458917..5966e191 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/common/fifo/channel.c
@@ -44,9 +44,9 @@
 #include <nvgpu/log2.h>
 #include <nvgpu/ptimer.h>
 
-#include "gk20a.h"
-#include "dbg_gpu_gk20a.h"
-#include "fence_gk20a.h"
+#include "gk20a/gk20a.h"
+#include "gk20a/dbg_gpu_gk20a.h"
+#include "gk20a/fence_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/os/linux/channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c
index fef44f2b..fef44f2b 100644
--- a/drivers/gpu/nvgpu/os/linux/channel.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c
diff --git a/drivers/gpu/nvgpu/os/posix/channel.c b/drivers/gpu/nvgpu/os/posix/posix-channel.c
index 05697159..05697159 100644
--- a/drivers/gpu/nvgpu/os/posix/channel.c
+++ b/drivers/gpu/nvgpu/os/posix/posix-channel.c