gpu: nvgpu: move tsg code to common

tsg_gk20a.c doesn't depend on any specific hardware, so move it to the
common directory.

Rename the posix tsg file to posix-tsg.c.

Jira NVGPU-967

Change-Id: I6e8908a8f6cf43132db8dffe3a99e424e4f764b1
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1821509
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Holtta
2018-09-12 12:40:10 +03:00
committed by mobile promotions
parent 5c7a740403
commit c47eab005a
13 changed files with 16 additions and 17 deletions

View File

@@ -224,6 +224,7 @@ nvgpu-y += \
common/sim_pci.o \
common/fifo/channel.o \
common/fifo/submit.o \
common/fifo/tsg.o \
common/ecc.o \
common/ce2.o \
gk20a/gk20a.o \
@@ -238,7 +239,6 @@ nvgpu-y += \
gk20a/fence_gk20a.o \
gk20a/gr_ctx_gk20a_sim.o \
gk20a/gr_ctx_gk20a.o \
gk20a/tsg_gk20a.o \
gk20a/fecs_trace_gk20a.o \
gm20b/hal_gm20b.o \
gm20b/gr_gm20b.o \

View File

@@ -40,7 +40,7 @@ srcs := os/posix/nvgpu.c \
os/posix/fuse.c \
os/posix/clk_arb.c \
os/posix/posix-channel.c \
os/posix/tsg.c \
os/posix/posix-tsg.c \
os/posix/nvlink.c \
os/posix/lock.c \
os/posix/stubs.c \
@@ -109,6 +109,7 @@ srcs := os/posix/nvgpu.c \
common/clock_gating/gv100_gating_reglist.c \
common/fifo/channel.c \
common/fifo/submit.c \
common/fifo/tsg.c \
common/mc/mc.c \
common/mc/mc_gm20b.c \
common/mc/mc_gp10b.c \
@@ -158,7 +159,6 @@ srcs := os/posix/nvgpu.c \
gk20a/fence_gk20a.c \
gk20a/gr_ctx_gk20a_sim.c \
gk20a/gr_ctx_gk20a.c \
gk20a/tsg_gk20a.c \
gm20b/hal_gm20b.c \
gm20b/gr_gm20b.c \
gm20b/clk_gm20b.c \

View File

@@ -24,9 +24,8 @@
#include <nvgpu/log.h>
#include <nvgpu/os_sched.h>
#include <nvgpu/channel.h>
#include "gk20a.h"
#include "tsg_gk20a.h"
#include <nvgpu/tsg.h>
#include <nvgpu/gk20a.h>
bool gk20a_is_channel_marked_as_tsg(struct channel_gk20a *ch)
{

View File

@@ -28,6 +28,7 @@
#include <nvgpu/error_notifier.h>
#include <nvgpu/gk20a.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include "common/clock_gating/gm20b_gating_reglist.h"
#include "common/bus/bus_gm20b.h"
@@ -50,7 +51,6 @@
#include "gk20a/regops_gk20a.h"
#include "gk20a/pmu_gk20a.h"
#include "gk20a/gr_gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "gr_gm20b.h"
#include "fifo_gm20b.h"

View File

@@ -29,6 +29,7 @@
#include <nvgpu/error_notifier.h>
#include <nvgpu/gk20a.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include "common/bus/bus_gk20a.h"
#include "common/clock_gating/gp10b_gating_reglist.h"
@@ -57,7 +58,6 @@
#include "gk20a/regops_gk20a.h"
#include "gk20a/pmu_gk20a.h"
#include "gk20a/gr_gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "gp10b/gr_gp10b.h"
#include "gp10b/fecs_trace_gp10b.h"

View File

@@ -66,11 +66,11 @@ struct nvgpu_gpfifo_args;
#include <nvgpu/nvlink.h>
#include <nvgpu/sim.h>
#include <nvgpu/ecc.h>
#include <nvgpu/tsg.h>
#include "gk20a/clk_gk20a.h"
#include "gk20a/ce2_gk20a.h"
#include "gk20a/fifo_gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "clk/clk.h"
#include "perf/perf.h"
#include "pmgr/pmgr.h"

View File

@@ -26,7 +26,7 @@
#include <nvgpu/kref.h>
#include <nvgpu/rwsem.h>
#include "gr_gk20a.h"
#include "gk20a/gr_gk20a.h"
#define NVGPU_INVALID_TSG_ID (-1)

View File

@@ -31,12 +31,12 @@
#include <nvgpu/cond.h>
#include <nvgpu/utils.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include <nvgpu/linux/vm.h>
#include "gk20a/gk20a.h"
#include "gk20a/gr_gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "gk20a/regops_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "os_linux.h"

View File

@@ -26,9 +26,9 @@
#include <nvgpu/log.h>
#include <nvgpu/os_sched.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include "gk20a/gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "gv11b/fifo_gv11b.h"
#include "platform_gk20a.h"
#include "ioctl_tsg.h"

View File

@@ -36,7 +36,6 @@
#include "vgpu_linux.h"
#include "vgpu/fecs_trace_vgpu.h"
#include "vgpu/clk_vgpu.h"
#include "gk20a/tsg_gk20a.h"
#include "gk20a/regops_gk20a.h"
#include "gm20b/hal_gm20b.h"

View File

@@ -20,7 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "gk20a/tsg_gk20a.h"
#include <nvgpu/tsg.h>
void gk20a_tsg_event_id_post_event(struct tsg_gk20a *tsg,
int __event_id)

View File

@@ -30,11 +30,11 @@
#include <nvgpu/vgpu/vgpu_ivc.h>
#include <nvgpu/vgpu/vgpu.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include "gr_vgpu.h"
#include "gk20a/gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h"
#include <nvgpu/hw/gk20a/hw_gr_gk20a.h>

View File

@@ -21,11 +21,12 @@
*/
#include "gk20a/gk20a.h"
#include "gk20a/tsg_gk20a.h"
#include "fifo_vgpu.h"
#include <nvgpu/channel.h>
#include <nvgpu/channel.h>
#include <nvgpu/tsg.h>
#include <nvgpu/bug.h>
#include <nvgpu/vgpu/tegra_vgpu.h>
#include <nvgpu/vgpu/vgpu.h>