From 37253f8ccbf8afa1d075b2010bd569db08aa6e06 Mon Sep 17 00:00:00 2001
From: Philip Elcan <pelcan@nvidia.com>
Date: Tue, 16 Apr 2019 14:27:44 -0400
Subject: [PATCH] gpu: nvgpu: init: cleanup headers

Remove unnecessary header files from nvgpu.common.hal.init unit.

Change-Id: I60f979cd700c3a8fc5fd78cfcac0298e1766ac25
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2098916
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/hal/init/hal_gm20b.c | 11 -----------
 drivers/gpu/nvgpu/hal/init/hal_gp10b.c | 12 ------------
 drivers/gpu/nvgpu/hal/init/hal_gv100.c | 16 ----------------
 drivers/gpu/nvgpu/hal/init/hal_gv11b.c | 13 -------------
 drivers/gpu/nvgpu/hal/init/hal_tu104.c | 16 ----------------
 5 files changed, 68 deletions(-)

diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
index 527dde171..f0da6e625 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
@@ -21,25 +21,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <nvgpu/debug.h>
-#include <nvgpu/bug.h>
 #include <nvgpu/class.h>
-#include <nvgpu/enabled.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/debugger.h>
-#include <nvgpu/channel.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/pbdma.h>
-#include <nvgpu/tsg.h>
 #include <nvgpu/perfbuf.h>
 #include <nvgpu/cyclestats_snapshot.h>
 #include <nvgpu/fifo/userd.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/regops.h>
 #include <nvgpu/gr/zbc.h>
-#include <nvgpu/gr/zcull.h>
 #include <nvgpu/gr/gr.h>
 #include <nvgpu/gr/gr_intr.h>
 #include <nvgpu/gr/gr_falcon.h>
@@ -97,9 +91,6 @@
 #include "common/pmu/pg/pg_sw_gm20b.h"
 
 #include "gk20a/ce2_gk20a.h"
-#include "gk20a/fifo_gk20a.h"
-#include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/mm_gm20b.h"
@@ -107,8 +98,6 @@
 #include "hal_gm20b.h"
 
 #include <nvgpu/hw/gm20b/hw_proj_gm20b.h>
-#include <nvgpu/hw/gm20b/hw_top_gm20b.h>
-#include <nvgpu/hw/gm20b/hw_gr_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_pwr_gm20b.h>
 
 #define PRIV_SECURITY_DISABLE 0x01
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
index 557251ff9..b84153279 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
@@ -21,25 +21,19 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <nvgpu/debug.h>
-#include <nvgpu/bug.h>
 #include <nvgpu/class.h>
-#include <nvgpu/enabled.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/gk20a.h>
 #include <nvgpu/debugger.h>
-#include <nvgpu/channel.h>
 #include <nvgpu/pbdma.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/fifo/userd.h>
-#include <nvgpu/tsg.h>
 #include <nvgpu/perfbuf.h>
 #include <nvgpu/cyclestats_snapshot.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/regops.h>
 #include <nvgpu/gr/zbc.h>
-#include <nvgpu/gr/zcull.h>
 #include <nvgpu/gr/gr_falcon.h>
 #include <nvgpu/gr/setup.h>
 #include <nvgpu/gr/fecs_trace.h>
@@ -120,25 +114,19 @@
 #include "common/fifo/channel_gm20b.h"
 #include "common/clk_arb/clk_arb_gp10b.h"
 
-#include "gk20a/fifo_gk20a.h"
-#include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/mm_gp10b.h"
 #include "gp10b/ce_gp10b.h"
 
 #include "gm20b/gr_gm20b.h"
-#include "gm20b/clk_gm20b.h"
 #include "gm20b/mm_gm20b.h"
 
 #include "hal_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_proj_gp10b.h>
-#include <nvgpu/hw/gp10b/hw_top_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pram_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h>
-#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 
 static void gp10b_init_gpu_characteristics(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c
index a1b1c333a..eb92cd1bc 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c
@@ -39,7 +39,6 @@
 #include "hal/cbc/cbc_gp10b.h"
 #include "hal/therm/therm_gm20b.h"
 #include "hal/therm/therm_gp106.h"
-#include "hal/therm/therm_gp10b.h"
 #include "hal/therm/therm_gv11b.h"
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
@@ -104,7 +103,6 @@
 #include "hal/pmu/pmu_gm20b.h"
 #include "hal/pmu/pmu_gp10b.h"
 #include "hal/pmu/pmu_gp106.h"
-#include "hal/pmu/pmu_gv11b.h"
 #include "hal/falcon/falcon_gk20a.h"
 #include "hal/nvdec/nvdec_gp106.h"
 #include "hal/gsp/gsp_gv100.h"
@@ -121,7 +119,6 @@
 #include "hal/nvlink/minion_gv100.h"
 #include "hal/nvlink/link_mode_transitions_gv100.h"
 #include "common/nvlink/nvlink_gv100.h"
-#include "common/nvlink/nvlink_tu104.h"
 #include "common/pmu/perf/perf_gv100.h"
 #include "common/sync/syncpt_cmdbuf_gv11b.h"
 #include "common/sync/sema_cmdbuf_gv11b.h"
@@ -129,11 +126,7 @@
 #include "common/fifo/channel_gm20b.h"
 #include "common/fifo/channel_gv11b.h"
 #include "common/fifo/channel_gv100.h"
-#include "common/clk_arb/clk_arb_gv100.h"
 
-#include "gk20a/fifo_gk20a.h"
-#include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/mm_gm20b.h"
@@ -144,7 +137,6 @@
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/mm_gp10b.h"
 
-#include "hal_gv11b.h"
 #include "gv11b/gr_gv11b.h"
 #include "gv11b/ce_gv11b.h"
 #include "gv11b/mm_gv11b.h"
@@ -159,13 +151,8 @@
 
 #include <nvgpu/ptimer.h>
 #include <nvgpu/class.h>
-#include <nvgpu/debug.h>
-#include <nvgpu/enabled.h>
 #include <nvgpu/error_notifier.h>
-#include <nvgpu/clk_arb.h>
-#include <nvgpu/gk20a.h>
 #include <nvgpu/debugger.h>
-#include <nvgpu/channel.h>
 #include <nvgpu/pbdma.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/fifo/userd.h>
@@ -173,7 +160,6 @@
 #include <nvgpu/cyclestats_snapshot.h>
 #include <nvgpu/regops.h>
 #include <nvgpu/gr/zbc.h>
-#include <nvgpu/gr/zcull.h>
 #include <nvgpu/gr/gr_falcon.h>
 #include <nvgpu/gr/setup.h>
 #include <nvgpu/gr/fecs_trace.h>
@@ -183,10 +169,8 @@
 #include <nvgpu/pmu/lpwr.h>
 
 #include <nvgpu/hw/gv100/hw_proj_gv100.h>
-#include <nvgpu/hw/gv100/hw_top_gv100.h>
 #include <nvgpu/hw/gv100/hw_pram_gv100.h>
 #include <nvgpu/hw/gv100/hw_pwr_gv100.h>
-#include <nvgpu/hw/gv100/hw_gr_gv100.h>
 
 static u32 gv100_get_litter_value(struct gk20a *g, int value)
 {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
index aec584e76..5320a30db 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
@@ -43,11 +43,9 @@
 #include "hal/priv_ring/priv_ring_gp10b.h"
 #include "hal/gr/config/gr_config_gv100.h"
 #include "hal/power_features/cg/gv11b_gating_reglist.h"
-#include "hal/cbc/cbc_gm20b.h"
 #include "hal/cbc/cbc_gp10b.h"
 #include "hal/cbc/cbc_gv11b.h"
 #include "hal/therm/therm_gm20b.h"
-#include "hal/therm/therm_gp10b.h"
 #include "hal/therm/therm_gv11b.h"
 #include "hal/ltc/ltc_gm20b.h"
 #include "hal/ltc/ltc_gp10b.h"
@@ -124,9 +122,6 @@
 #include "common/fifo/channel_gv11b.h"
 #include "common/clk_arb/clk_arb_gp10b.h"
 
-#include "gk20a/fifo_gk20a.h"
-#include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/mm_gm20b.h"
@@ -144,27 +139,19 @@
 #include "gv11b/fifo_gv11b.h"
 
 #include <nvgpu/ptimer.h>
-#include <nvgpu/debug.h>
-#include <nvgpu/enabled.h>
 #include <nvgpu/error_notifier.h>
-#include <nvgpu/bug.h>
 #include <nvgpu/debugger.h>
-#include <nvgpu/channel.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/fifo/userd.h>
 #include <nvgpu/perfbuf.h>
 #include <nvgpu/cyclestats_snapshot.h>
 #include <nvgpu/gr/zbc.h>
-#include <nvgpu/gr/zcull.h>
 #include <nvgpu/gr/setup.h>
 #include <nvgpu/gr/fecs_trace.h>
-#include <nvgpu/gr/gr.h>
 #include <nvgpu/gr/gr_intr.h>
 
 #include <nvgpu/hw/gv11b/hw_proj_gv11b.h>
-#include <nvgpu/hw/gv11b/hw_top_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_pwr_gv11b.h>
-#include <nvgpu/hw/gv11b/hw_gr_gv11b.h>
 
 static void gv11b_init_gpu_characteristics(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
index 73d106125..af1ceefac 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
@@ -30,7 +30,6 @@
 #include "hal/mc/mc_gv100.h"
 #include "hal/mc/mc_tu104.h"
 #include "hal/bus/bus_gk20a.h"
-#include "hal/bus/bus_gp10b.h"
 #include "hal/bus/bus_gv100.h"
 #include "hal/bus/bus_tu104.h"
 #include "hal/class/class_tu104.h"
@@ -38,10 +37,8 @@
 #include "hal/priv_ring/priv_ring_gp10b.h"
 #include "hal/power_features/cg/tu104_gating_reglist.h"
 #include "hal/cbc/cbc_gm20b.h"
-#include "hal/cbc/cbc_gp10b.h"
 #include "hal/cbc/cbc_tu104.h"
 #include "hal/therm/therm_gm20b.h"
-#include "hal/therm/therm_gp10b.h"
 #include "hal/therm/therm_gp106.h"
 #include "hal/therm/therm_gv11b.h"
 #include "hal/ltc/ltc_gm20b.h"
@@ -143,28 +140,21 @@
 #include "hal/fifo/pbdma_status_gm20b.h"
 #include "common/clk_arb/clk_arb_gv100.h"
 
-#include "gk20a/fifo_gk20a.h"
-#include "gk20a/mm_gk20a.h"
-#include "gk20a/gr_gk20a.h"
 
 #include "gm20b/gr_gm20b.h"
 #include "gm20b/mm_gm20b.h"
 
 #include "gv100/clk_gv100.h"
 
-#include "gp106/bios_gp106.h"
 
 #include "gp10b/gr_gp10b.h"
-#include "gp10b/ce_gp10b.h"
 #include "gp10b/mm_gp10b.h"
 
-#include "hal_gv11b.h"
 #include "gv11b/gr_gv11b.h"
 #include "gv11b/ce_gv11b.h"
 #include "gv11b/mm_gv11b.h"
 #include "gv11b/fifo_gv11b.h"
 
-#include "gv100/bios_gv100.h"
 #include "gv100/fifo_gv100.h"
 #include "gv100/gr_gv100.h"
 
@@ -176,14 +166,10 @@
 #include "hal_tu104.h"
 
 #include <nvgpu/ptimer.h>
-#include <nvgpu/debug.h>
-#include <nvgpu/enabled.h>
 #include <nvgpu/error_notifier.h>
-#include <nvgpu/gk20a.h>
 #include <nvgpu/clk_arb.h>
 #include <nvgpu/class.h>
 #include <nvgpu/debugger.h>
-#include <nvgpu/channel.h>
 #include <nvgpu/pbdma.h>
 #include <nvgpu/runlist.h>
 #include <nvgpu/fifo/userd.h>
@@ -200,10 +186,8 @@
 #include <nvgpu/pmu/pmu_perfmon.h>
 
 #include <nvgpu/hw/tu104/hw_proj_tu104.h>
-#include <nvgpu/hw/tu104/hw_top_tu104.h>
 #include <nvgpu/hw/tu104/hw_pram_tu104.h>
 #include <nvgpu/hw/tu104/hw_pwr_tu104.h>
-#include <nvgpu/hw/tu104/hw_gr_tu104.h>
 
 static u32 tu104_get_litter_value(struct gk20a *g, int value)
 {