diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/pmu/pmu.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fuse_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/therm_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/therm_gv11b.c | 2 |
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, | |||
338 | 338 | ||
339 | init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); | 339 | init = pv->get_pmu_msg_pmu_init_msg_ptr(&(msg->msg.init)); |
340 | if (!pmu->gid_info.valid) { | 340 | if (!pmu->gid_info.valid) { |
341 | u32 *gid_hdr_data = (u32 *)(gid_data.signature); | ||
341 | 342 | ||
342 | nvgpu_flcn_copy_from_dmem(pmu->flcn, | 343 | nvgpu_flcn_copy_from_dmem(pmu->flcn, |
343 | pv->get_pmu_init_msg_pmu_sw_mg_off(init), | 344 | pv->get_pmu_init_msg_pmu_sw_mg_off(init), |
@@ -345,7 +346,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, | |||
345 | sizeof(struct pmu_sha1_gid_data), 0); | 346 | sizeof(struct pmu_sha1_gid_data), 0); |
346 | 347 | ||
347 | pmu->gid_info.valid = | 348 | pmu->gid_info.valid = |
348 | (*(u32 *)gid_data.signature == PMU_SHA1_GID_SIGNATURE); | 349 | (*gid_hdr_data == PMU_SHA1_GID_SIGNATURE); |
349 | 350 | ||
350 | if (pmu->gid_info.valid) { | 351 | if (pmu->gid_info.valid) { |
351 | 352 | ||
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); | |||
563 | 563 | ||
564 | int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a); | 564 | int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a); |
565 | 565 | ||
566 | int gr_gk20a_init_ctx_vars(struct gk20a *g, struct gr_gk20a *gr); | ||
567 | |||
568 | int gk20a_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags); | 566 | int gk20a_alloc_obj_ctx(struct channel_gk20a *c, u32 class_num, u32 flags); |
569 | 567 | ||
570 | int gk20a_gr_isr(struct gk20a *g); | 568 | 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, | |||
92 | bool gr_gm20b_is_tpc_addr(struct gk20a *g, u32 addr); | 92 | bool gr_gm20b_is_tpc_addr(struct gk20a *g, u32 addr); |
93 | u32 gr_gm20b_get_tpc_num(struct gk20a *g, u32 addr); | 93 | u32 gr_gm20b_get_tpc_num(struct gk20a *g, u32 addr); |
94 | int gr_gm20b_load_ctxsw_ucode(struct gk20a *g); | 94 | int gr_gm20b_load_ctxsw_ucode(struct gk20a *g); |
95 | int gr_gm20b_load_ctxsw_ucode(struct gk20a *g); | ||
96 | void gr_gm20b_detect_sm_arch(struct gk20a *g); | 95 | void gr_gm20b_detect_sm_arch(struct gk20a *g); |
97 | u32 gr_gm20b_pagepool_default_size(struct gk20a *g); | 96 | u32 gr_gm20b_pagepool_default_size(struct gk20a *g); |
98 | int gr_gm20b_alloc_gr_ctx(struct gk20a *g, | 97 | 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 @@ | |||
30 | 30 | ||
31 | #include "gm20b/fuse_gm20b.h" | 31 | #include "gm20b/fuse_gm20b.h" |
32 | 32 | ||
33 | #include "fuse_gp10b.h" | ||
34 | |||
33 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> | 35 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> |
34 | 36 | ||
35 | int gp10b_fuse_check_priv_security(struct gk20a *g) | 37 | 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 @@ | |||
33 | #include <nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h> | 33 | #include <nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h> |
34 | #include <nvgpu/hw/gp10b/hw_pri_ringstation_gpc_gp10b.h> | 34 | #include <nvgpu/hw/gp10b/hw_pri_ringstation_gpc_gp10b.h> |
35 | 35 | ||
36 | #include "priv_ring_gp10b.h" | ||
37 | |||
36 | static const char * const invalid_str = "invalid"; | 38 | static const char * const invalid_str = "invalid"; |
37 | 39 | ||
38 | static const char *const error_type_badf1xyy[] = { | 40 | 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) | |||
133 | gk20a_dbg_fn("done"); | 133 | gk20a_dbg_fn("done"); |
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | |||
137 | void gp10b_init_therm_ops(struct gpu_ops *gops) | ||
138 | { | ||
139 | gops->therm.init_therm_setup_hw = gp10b_init_therm_setup_hw; | ||
140 | gops->therm.elcg_init_idle_filters = gp10b_elcg_init_idle_filters; | ||
141 | } | ||
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 @@ | |||
28 | 28 | ||
29 | #include <nvgpu/hw/gv11b/hw_therm_gv11b.h> | 29 | #include <nvgpu/hw/gv11b/hw_therm_gv11b.h> |
30 | 30 | ||
31 | #include "therm_gv11b.h" | ||
32 | |||
31 | int gv11b_init_therm_setup_hw(struct gk20a *g) | 33 | int gv11b_init_therm_setup_hw(struct gk20a *g) |
32 | { | 34 | { |
33 | u32 v; | 35 | u32 v; |