From 20d611b08128a87fb06c6be7c09360fc969f9fd0 Mon Sep 17 00:00:00 2001
From: Thomas Fleury <tfleury@nvidia.com>
Date: Thu, 16 May 2019 15:09:53 -0700
Subject: [PATCH] gpu: nvgpu: unit: move gv11b reg spaces to unit/fifo

Move gv11b reg spaces initializations to unit/fifo, so that
it can be re-used by all fifo sub-units.

Jira NVGPU-3476

Change-Id: I9dd8564e71cb1b4c90a6a7df856e6eeadfedc649
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2120585
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 userspace/units/fifo/{tsg => }/nvgpu-fifo-gv11b.c | 0
 userspace/units/fifo/{tsg => }/nvgpu-fifo-gv11b.h | 0
 userspace/units/fifo/tsg/Makefile                 | 2 +-
 userspace/units/fifo/tsg/nvgpu-tsg.c              | 2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename userspace/units/fifo/{tsg => }/nvgpu-fifo-gv11b.c (100%)
 rename userspace/units/fifo/{tsg => }/nvgpu-fifo-gv11b.h (100%)

diff --git a/userspace/units/fifo/tsg/nvgpu-fifo-gv11b.c b/userspace/units/fifo/nvgpu-fifo-gv11b.c
similarity index 100%
rename from userspace/units/fifo/tsg/nvgpu-fifo-gv11b.c
rename to userspace/units/fifo/nvgpu-fifo-gv11b.c
diff --git a/userspace/units/fifo/tsg/nvgpu-fifo-gv11b.h b/userspace/units/fifo/nvgpu-fifo-gv11b.h
similarity index 100%
rename from userspace/units/fifo/tsg/nvgpu-fifo-gv11b.h
rename to userspace/units/fifo/nvgpu-fifo-gv11b.h
diff --git a/userspace/units/fifo/tsg/Makefile b/userspace/units/fifo/tsg/Makefile
index 93e765076..e127217ed 100644
--- a/userspace/units/fifo/tsg/Makefile
+++ b/userspace/units/fifo/tsg/Makefile
@@ -20,7 +20,7 @@
 
 .SUFFIXES:
 
-OBJS   = nvgpu-tsg.o nvgpu-fifo-gv11b.o
+OBJS   = nvgpu-tsg.o ../nvgpu-fifo-gv11b.o
 MODULE = nvgpu-tsg
 
 include ../../Makefile.units
diff --git a/userspace/units/fifo/tsg/nvgpu-tsg.c b/userspace/units/fifo/tsg/nvgpu-tsg.c
index b86e3d92d..e969d3572 100644
--- a/userspace/units/fifo/tsg/nvgpu-tsg.c
+++ b/userspace/units/fifo/tsg/nvgpu-tsg.c
@@ -36,7 +36,7 @@
 
 #include "hal/init/hal_gv11b.h"
 
-#include "nvgpu-fifo-gv11b.h"
+#include "../nvgpu-fifo-gv11b.h"
 
 struct test_tsg_args {
 	bool init_done;