summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2016-01-21 05:48:26 -0500
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-01-27 12:59:11 -0500
commit04092f74bb473fadfede8955b33807124e642b6c (patch)
tree64ed2f85168dec2e10b99a8689c7fc951f57bfdd
parentc43053761b4c74c584f22f31c3d8585df8c6d233 (diff)
gpu: nvgpu: set set_sm_debug_mode() for gm20b
Set function pointer gops->gr.set_sm_debug_mode() for gm20b Bug 200168107 Change-Id: I40eebbc55b0f82f793fcea90245ae6dad0f5779c Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/935773 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Richard Zhao <rizhao@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.h2
-rw-r--r--drivers/gpu/nvgpu/gm20b/gr_gm20b.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index f31f7170..bf7a3fa7 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -7423,7 +7423,7 @@ static void gr_gk20a_init_cyclestats(struct gk20a *g)
7423#endif 7423#endif
7424} 7424}
7425 7425
7426static int gr_gk20a_set_sm_debug_mode(struct gk20a *g, 7426int gr_gk20a_set_sm_debug_mode(struct gk20a *g,
7427 struct channel_gk20a *ch, u64 sms, bool enable) 7427 struct channel_gk20a *ch, u64 sms, bool enable)
7428{ 7428{
7429 struct nvgpu_dbg_gpu_reg_op *ops; 7429 struct nvgpu_dbg_gpu_reg_op *ops;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index c7100182..c58daefa 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -518,6 +518,8 @@ void gk20a_suspend_all_sms(struct gk20a *g,
518 u32 global_esr_mask, bool check_errors); 518 u32 global_esr_mask, bool check_errors);
519int gk20a_gr_lock_down_sm(struct gk20a *g, 519int gk20a_gr_lock_down_sm(struct gk20a *g,
520 u32 gpc, u32 tpc, u32 global_esr_mask); 520 u32 gpc, u32 tpc, u32 global_esr_mask);
521int gr_gk20a_set_sm_debug_mode(struct gk20a *g,
522 struct channel_gk20a *ch, u64 sms, bool enable);
521bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch); 523bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch);
522int gr_gk20a_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr, 524int gr_gk20a_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr,
523 struct zbc_entry *color_val, u32 index); 525 struct zbc_entry *color_val, u32 index);
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 74d687ec..a80cef8f 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -1223,6 +1223,7 @@ void gm20b_init_gr(struct gpu_ops *gops)
1223 gops->gr.init_sm_dsm_reg_info = gr_gm20b_init_sm_dsm_reg_info; 1223 gops->gr.init_sm_dsm_reg_info = gr_gm20b_init_sm_dsm_reg_info;
1224 gops->gr.wait_empty = gr_gk20a_wait_idle; 1224 gops->gr.wait_empty = gr_gk20a_wait_idle;
1225 gops->gr.init_cyclestats = gr_gm20b_init_cyclestats; 1225 gops->gr.init_cyclestats = gr_gm20b_init_cyclestats;
1226 gops->gr.set_sm_debug_mode = gr_gk20a_set_sm_debug_mode;
1226 gops->gr.enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs; 1227 gops->gr.enable_cde_in_fecs = gr_gm20b_enable_cde_in_fecs;
1227 gops->gr.bpt_reg_info = gr_gm20b_bpt_reg_info; 1228 gops->gr.bpt_reg_info = gr_gm20b_bpt_reg_info;
1228 gops->gr.get_access_map = gr_gm20b_get_access_map; 1229 gops->gr.get_access_map = gr_gm20b_get_access_map;