nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add resume_single_sm gr ops

Browse Source 
This is required to support multiple SM and t19x
sm register address changes

JIRA GPUT19X-75

Change-Id: If8805bcc042c75ea70c1689306feb3c8bf011655
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master/r/1512216
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
This commit is contained in:
Seema Khowala
2017-07-02 16:43:31 -07:00
committed by mobile promotions
parent 29b688960f
commit 1ab0eec6ea
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -375,6 +375,8 @@ struct gpu_ops {
u32 global_esr_mask, bool check_errors); u32 global_esr_mask, bool check_errors);
void (*suspend_all_sms)(struct gk20a *g, void (*suspend_all_sms)(struct gk20a *g,
u32 global_esr_mask, bool check_errors); u32 global_esr_mask, bool check_errors);
void (*resume_single_sm)(struct gk20a *g,
u32 gpc, u32 tpc, u32 sm);
} gr; } gr;
struct { struct {
void (*init_hw)(struct gk20a *g); void (*init_hw)(struct gk20a *g);

8
drivers/gpu/nvgpu/gk20a/gr_gk20a.c
View File

@@ -8088,13 +8088,11 @@ void gk20a_gr_suspend_all_sms(struct gk20a *g,
} }
} }
void gk20a_resume_single_sm(struct gk20a *g, void gk20a_gr_resume_single_sm(struct gk20a *g,
u32 gpc, u32 tpc) u32 gpc, u32 tpc, u32 sm)
{ {
u32 dbgr_control0; u32 dbgr_control0;
u32 offset; u32 offset;
u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE);
u32 tpc_in_gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE);
/* /*
* The following requires some clarification. Despite the fact that both * The following requires some clarification. Despite the fact that both
* RUN_TRIGGER and STOP_TRIGGER have the word "TRIGGER" in their * RUN_TRIGGER and STOP_TRIGGER have the word "TRIGGER" in their
@@ -8108,7 +8106,7 @@ void gk20a_resume_single_sm(struct gk20a *g,
* effect, before enabling the run trigger. * effect, before enabling the run trigger.
*/ */
offset = gpc_stride * gpc + tpc_in_gpc_stride * tpc; offset = gk20a_gr_gpc_offset(g, gpc) + gk20a_gr_tpc_offset(g, tpc);
/*De-assert stop trigger */ /*De-assert stop trigger */
dbgr_control0 = dbgr_control0 =

4
drivers/gpu/nvgpu/gk20a/gr_gk20a.h
View File

@@ -612,8 +612,8 @@ void gr_gk20a_load_ctxsw_ucode_boot(struct gk20a *g, u64 addr_base,
void gr_gk20a_free_tsg_gr_ctx(struct tsg_gk20a *c); void gr_gk20a_free_tsg_gr_ctx(struct tsg_gk20a *c);
int gr_gk20a_disable_ctxsw(struct gk20a *g); int gr_gk20a_disable_ctxsw(struct gk20a *g);
int gr_gk20a_enable_ctxsw(struct gk20a *g); int gr_gk20a_enable_ctxsw(struct gk20a *g);
void gk20a_resume_single_sm(struct gk20a *g, void gk20a_gr_resume_single_sm(struct gk20a *g,
u32 gpc, u32 tpc); u32 gpc, u32 tpc, u32 sm);
void gk20a_resume_all_sms(struct gk20a *g); void gk20a_resume_all_sms(struct gk20a *g);
void gk20a_gr_suspend_single_sm(struct gk20a *g, void gk20a_gr_suspend_single_sm(struct gk20a *g,
u32 gpc, u32 tpc, u32 sm, u32 gpc, u32 tpc, u32 sm,

1
drivers/gpu/nvgpu/gm20b/gr_gm20b.c
View File

@@ -1633,4 +1633,5 @@ void gm20b_init_gr(struct gpu_ops *gops)
gops->gr.sm_debugger_attached = gk20a_gr_sm_debugger_attached; gops->gr.sm_debugger_attached = gk20a_gr_sm_debugger_attached;
gops->gr.suspend_single_sm = gk20a_gr_suspend_single_sm; gops->gr.suspend_single_sm = gk20a_gr_suspend_single_sm;
gops->gr.suspend_all_sms = gk20a_gr_suspend_all_sms; gops->gr.suspend_all_sms = gk20a_gr_suspend_all_sms;
gops->gr.resume_single_sm = gk20a_gr_resume_single_sm;
} }

2
drivers/gpu/nvgpu/gp10b/gr_gp10b.c
View File

@@ -1860,7 +1860,7 @@ static int gr_gp10b_pre_process_sm_exception(struct gk20a *g,
gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg,
"CILP: resume for gpc %d tpc %d\n", "CILP: resume for gpc %d tpc %d\n",
gpc, tpc); gpc, tpc);
gk20a_resume_single_sm(g, gpc, tpc); g->ops.gr.resume_single_sm(g, gpc, tpc, sm);
*ignore_debugger = true; *ignore_debugger = true;
gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "CILP: All done on gpc %d, tpc %d\n", gpc, tpc); gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "CILP: All done on gpc %d, tpc %d\n", gpc, tpc);