From 63fb543f63a8baced2f7fd141130584f911c8109 Mon Sep 17 00:00:00 2001
From: Vinod G <vinodg@nvidia.com>
Date: Wed, 10 Apr 2019 15:50:48 -0700
Subject: [PATCH] gpu: nvgpu: Clean up gr_gk20a.h and gk20a.h

Initial cleanup process of gk20a.h
Remove unused structs. Add more structs to avoid including
gr_gk20a.h. This need more structs to be moved from gr_gk20a.h
Remove including pramin.h/acr.h/falcon.h and sim.h

Removed unused struct and netlist.h include from gr_gk20a.h

JIRA NVGPU-3132
JIRA NVGPU-3079

Change-Id: I1e965dd572e8e45bb20fca73ea566a6411aeebc1
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2094732
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/acr/acr.c            |  1 +
 drivers/gpu/nvgpu/common/acr/acr_bootstrap.c  |  1 +
 drivers/gpu/nvgpu/common/gr/gr.c              |  1 +
 drivers/gpu/nvgpu/common/gr/gr_falcon.c       |  1 +
 drivers/gpu/nvgpu/common/gr/obj_ctx.c         |  1 +
 drivers/gpu/nvgpu/common/init/nvgpu_init.c    |  1 +
 drivers/gpu/nvgpu/common/mm/mm.c              |  1 +
 drivers/gpu/nvgpu/common/mm/nvgpu_mem.c       |  1 +
 drivers/gpu/nvgpu/gk20a/gr_gk20a.h            |  3 ---
 drivers/gpu/nvgpu/hal/gr/init/gr_init_gv11b.c |  1 +
 drivers/gpu/nvgpu/include/nvgpu/gk20a.h       | 23 +++++++++----------
 drivers/gpu/nvgpu/os/linux/module.h           |  1 +
 12 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/nvgpu/common/acr/acr.c b/drivers/gpu/nvgpu/common/acr/acr.c
index 69a7d5abb..c88267c47 100644
--- a/drivers/gpu/nvgpu/common/acr/acr.c
+++ b/drivers/gpu/nvgpu/common/acr/acr.c
@@ -24,6 +24,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/firmware.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/acr.h>
 #include <nvgpu/pmuif/gpmuif_cmn.h>
 
 #include "acr_priv.h"
diff --git a/drivers/gpu/nvgpu/common/acr/acr_bootstrap.c b/drivers/gpu/nvgpu/common/acr/acr_bootstrap.c
index 762d47214..afdb522f3 100644
--- a/drivers/gpu/nvgpu/common/acr/acr_bootstrap.c
+++ b/drivers/gpu/nvgpu/common/acr/acr_bootstrap.c
@@ -28,6 +28,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/acr.h>
 #include <nvgpu/bug.h>
 
 #include "acr_falcon_bl.h"
diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index 84fec17ab..daf8a5975 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -26,6 +26,7 @@
 #include <nvgpu/gr/config.h>
 #include <nvgpu/gr/zbc.h>
 #include <nvgpu/gr/zcull.h>
+#include <nvgpu/netlist.h>
 #include <nvgpu/gr/gr_falcon.h>
 #include <nvgpu/gr/ctx.h>
 #include <nvgpu/unit.h>
diff --git a/drivers/gpu/nvgpu/common/gr/gr_falcon.c b/drivers/gpu/nvgpu/common/gr/gr_falcon.c
index 125899a4f..49fd52753 100644
--- a/drivers/gpu/nvgpu/common/gr/gr_falcon.c
+++ b/drivers/gpu/nvgpu/common/gr/gr_falcon.c
@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/gk20a.h>
+#include <nvgpu/netlist.h>
 #include <nvgpu/gr/gr_falcon.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/debug.h>
diff --git a/drivers/gpu/nvgpu/common/gr/obj_ctx.c b/drivers/gpu/nvgpu/common/gr/obj_ctx.c
index 2b60e05d9..b3aad6c7f 100644
--- a/drivers/gpu/nvgpu/common/gr/obj_ctx.c
+++ b/drivers/gpu/nvgpu/common/gr/obj_ctx.c
@@ -29,6 +29,7 @@
 #include <nvgpu/gr/global_ctx.h>
 #include <nvgpu/gr/obj_ctx.h>
 #include <nvgpu/gr/config.h>
+#include <nvgpu/netlist.h>
 #include <nvgpu/gr/gr_falcon.h>
 #include <nvgpu/gr/fs_state.h>
 #include <nvgpu/power_features/cg.h>
diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
index d3c48e6ae..792aaa5eb 100644
--- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c
+++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
@@ -29,6 +29,7 @@
 #include <nvgpu/soc.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/fifo.h>
+#include <nvgpu/acr.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/gmmu.h>
 #include <nvgpu/ltc.h>
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c
index 39e65d1b8..afdb2c8a3 100644
--- a/drivers/gpu/nvgpu/common/mm/mm.c
+++ b/drivers/gpu/nvgpu/common/mm/mm.c
@@ -24,6 +24,7 @@
 #include <nvgpu/vm.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/vm_area.h>
+#include <nvgpu/acr.h>
 #include <nvgpu/gmmu.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/semaphore.h>
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index d7f16e98d..798875481 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -27,6 +27,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/gk20a.h>
+#include <nvgpu/pramin.h>
 #include <nvgpu/string.h>
 
 /*
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 0499c0f42..7ce432284 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -25,7 +25,6 @@
 #define GR_GK20A_H
 
 #include <nvgpu/types.h>
-#include <nvgpu/netlist.h>
 
 #include "mm_gk20a.h"
 
@@ -178,8 +177,6 @@ struct gr_gk20a {
 	bool sw_ready;
 	bool skip_ucode_init;
 
-	struct nvgpu_preemption_modes_rec preemption_mode_rec;
-
 	u32 fecs_feature_override_ecc_val;
 
 	u32 cilp_preempt_pending_chid;
diff --git a/drivers/gpu/nvgpu/hal/gr/init/gr_init_gv11b.c b/drivers/gpu/nvgpu/hal/gr/init/gr_init_gv11b.c
index 3a077513f..c76d5f8f0 100644
--- a/drivers/gpu/nvgpu/hal/gr/init/gr_init_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/gr/init/gr_init_gv11b.c
@@ -27,6 +27,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/gr/ctx.h>
 #include <nvgpu/ltc.h>
+#include <nvgpu/netlist.h>
 
 #include <nvgpu/gr/config.h>
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 1cf273e38..3b5f53e7c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -30,8 +30,6 @@ struct channel_gk20a;
 struct gr_gk20a;
 struct sim_nvgpu;
 struct gk20a_ce_app;
-struct gk20a_ctxsw_ucode_segments;
-struct gk20a_fecs_trace;
 struct gk20a_ctxsw_trace;
 struct nvgpu_mem_alloc_tracker;
 struct dbg_profiler_object_data;
@@ -40,14 +38,13 @@ struct nvgpu_clk_pll_debug_data;
 struct nvgpu_nvhost_dev;
 struct nvgpu_netlist_vars;
 struct netlist_av_list;
-struct nvgpu_gr_global_ctx_buffer_desc;
+struct netlist_aiv_list;
+struct netlist_av64_list;
 struct nvgpu_gr_fecs_trace;
 struct nvgpu_gr_isr_data;
 struct nvgpu_gpu_ctxsw_trace_entry;
 struct nvgpu_cpu_time_correlation_sample;
-struct nvgpu_mem_sgt;
 struct nvgpu_warpstate;
-struct nvgpu_clk_session;
 struct nvgpu_clk_arb;
 #ifdef CONFIG_GK20A_CTXSW_TRACE
 struct nvgpu_gpu_ctxsw_trace_filter;
@@ -56,9 +53,6 @@ struct priv_cmd_entry;
 struct nvgpu_setup_bind_args;
 struct nvgpu_clk_pmupstate;
 struct perf_pmupstate;
-struct vin_device_v20;
-struct nvgpu_avfsvinobjs;
-struct nvgpu_set_fll_clk;
 struct boardobjgrp;
 struct boardobjgrp_pmu_cmd;
 struct boardobjgrpmask;
@@ -69,6 +63,7 @@ struct nvgpu_gr_subctx;
 struct nvgpu_gr_zbc;
 struct nvgpu_gr_zbc_entry;
 struct nvgpu_gr_zbc_query_params;
+struct nvgpu_gr_zcull;
 struct nvgpu_gr_zcull_info;
 struct nvgpu_gr_tpc_exception;
 struct nvgpu_channel_hw_state;
@@ -79,6 +74,14 @@ struct nvgpu_fecs_method_op;
 enum nvgpu_nvlink_minion_dlcmd;
 struct nvgpu_cbc;
 struct nvgpu_mem;
+struct gk20a_cs_snapshot_client;
+struct dbg_session_gk20a;
+struct gk20a_ctxsw_ucode_info;
+struct ctxsw_buf_offset_map_entry;
+struct nvgpu_dbg_reg_op;
+struct gk20a_cs_snapshot;
+struct nvgpu_preemption_modes_rec;
+struct nvgpu_gr_ctx;
 typedef void (*global_ctx_mem_destroy_fn)(struct gk20a *g,
 					struct nvgpu_mem *mem);
 
@@ -88,16 +91,12 @@ typedef void (*global_ctx_mem_destroy_fn)(struct gk20a *g,
 #include <nvgpu/mm.h>
 #include <nvgpu/as.h>
 #include <nvgpu/log.h>
-#include <nvgpu/pramin.h>
-#include <nvgpu/acr.h>
 #include <nvgpu/kref.h>
-#include <nvgpu/falcon.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/barrier.h>
 #include <nvgpu/rwsem.h>
 #include <nvgpu/nvlink.h>
-#include <nvgpu/sim.h>
 #include <nvgpu/ecc.h>
 #include <nvgpu/channel.h>
 #include <nvgpu/tsg.h>
diff --git a/drivers/gpu/nvgpu/os/linux/module.h b/drivers/gpu/nvgpu/os/linux/module.h
index 10847a716..218d33044 100644
--- a/drivers/gpu/nvgpu/os/linux/module.h
+++ b/drivers/gpu/nvgpu/os/linux/module.h
@@ -15,6 +15,7 @@
 
 struct gk20a;
 struct device;
+struct platform_device;
 struct nvgpu_os_linux;
 
 int gk20a_pm_finalize_poweron(struct device *dev);