gpu: nvgpu: Fixups for tmake build

Mostly just including necessary includes to make sure that
global function declarations actually match their implementations.

Also work around pointer munging warning:

/build/ddpx/linux/kernel/nvgpu/drivers/gpu/nvgpu/common/pmu/pmu.c: In function 'nvgpu_pmu_process_init_msg':
/build/ddpx/linux/kernel/nvgpu/drivers/gpu/nvgpu/common/pmu/pmu.c:348:4: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
    (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE);

Work around this warning by simply moving the type punning.
This code is certainly dangerous - it assumes the endianness
of the header data is the same as the machine this code is
running on. Apparently it works, though, so this ignores
the warning.

JIRA NVGPU-525

Change-Id: Id704bae7805440bebfad51c8c8365e6d2b7a39eb
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1692454
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

7 files changed, 8 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index aaae138c..c642a7bc 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -338,6 +338,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu,
 
         init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init));
         if (!pmu->gid_info.valid) {
+                u32 *gid_hdr_data = (u32 *)(gid_data.signature);
 
                 nvgpu_flcn_copy_from_dmem(pmu->flcn,
                         pv->get_pmu_init_msg_pmu_sw_mg_off(init),
@@ -345,7 +346,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu,
                         sizeof(struct pmu_sha1_gid_data), 0);
 
                 pmu->gid_info.valid =
-                        (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE);
+                        (*gid_hdr_data == PMU_SHA1_GID_SIGNATURE);
 
                 if (pmu->gid_info.valid) {
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index be149b73..a703ef9d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -563,8 +563,6 @@ void gk20a_gr_wait_initialized(struct gk20a *g);
 
 int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a);
 
-int gr_gk20a_init_ctx_vars(struct gk20a *g, struct gr_gk20a *gr);
-
 int gk20a_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags);
 
 int gk20a_gr_isr(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
index aabf6d95..ff32d8ff 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.h
@@ -92,7 +92,6 @@ int gr_gm20b_load_ctxsw_ucode_segments(struct gk20a *g, u64 addr_base,
 bool gr_gm20b_is_tpc_addr(struct gk20a *g, u32 addr);
 u32 gr_gm20b_get_tpc_num(struct gk20a *g, u32 addr);
 int gr_gm20b_load_ctxsw_ucode(struct gk20a *g);
-int gr_gm20b_load_ctxsw_ucode(struct gk20a *g);
 void gr_gm20b_detect_sm_arch(struct gk20a *g);
 u32 gr_gm20b_pagepool_default_size(struct gk20a *g);
 int gr_gm20b_alloc_gr_ctx(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c b/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c
index 7743c5df..c1fc6be7 100644
--- a/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fuse_gp10b.c
@@ -30,6 +30,8 @@
 
 #include "gm20b/fuse_gm20b.h"
 
+#include "fuse_gp10b.h"
+
 #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h>
 
 int gp10b_fuse_check_priv_security(struct gk20a *g)
diff --git a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
index 1a73ab0d..b9e4cace 100644
--- a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
@@ -33,6 +33,8 @@
 #include <nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pri_ringstation_gpc_gp10b.h>
 
+#include "priv_ring_gp10b.h"
+
 static const char * const invalid_str = "invalid";
 
 static const char *const error_type_badf1xyy[] = {
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
index e02259d8..c69bd0bb 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
@@ -133,9 +133,3 @@ int gp10b_elcg_init_idle_filters(struct gk20a *g)
         gk20a_dbg_fn("done");
         return 0;
 }
-
-void gp10b_init_therm_ops(struct gpu_ops *gops)
-{
-        gops->therm.init_therm_setup_hw = gp10b_init_therm_setup_hw;
-        gops->therm.elcg_init_idle_filters = gp10b_elcg_init_idle_filters;
-}
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
index fe843325..067c464b 100644
--- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
@@ -28,6 +28,8 @@
 
 #include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
 
+#include "therm_gv11b.h"
+
 int gv11b_init_therm_setup_hw(struct gk20a *g)
 {
         u32 v;