diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index f94be010c..aae54cc25 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -375,6 +375,8 @@ struct gpu_ops {
 				u32 global_esr_mask, bool check_errors);
 		void (*suspend_all_sms)(struct gk20a *g,
 				u32 global_esr_mask, bool check_errors);
+		void (*resume_single_sm)(struct gk20a *g,
+				u32 gpc, u32 tpc, u32 sm);
 	} gr;
 	struct {
 		void (*init_hw)(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index f6857b668..70abef78d 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -8088,13 +8088,11 @@ void gk20a_gr_suspend_all_sms(struct gk20a *g,
 	}
 }
 
-void gk20a_resume_single_sm(struct gk20a *g,
-		u32 gpc, u32 tpc)
+void gk20a_gr_resume_single_sm(struct gk20a *g,
+		u32 gpc, u32 tpc, u32 sm)
 {
 	u32 dbgr_control0;
 	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
 	 * 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.
 	*/
 
-	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 */
 	dbgr_control0 =
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 90abcf223..659b37a6b 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -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);
 int gr_gk20a_disable_ctxsw(struct gk20a *g);
 int gr_gk20a_enable_ctxsw(struct gk20a *g);
-void gk20a_resume_single_sm(struct gk20a *g,
-		u32 gpc, u32 tpc);
+void gk20a_gr_resume_single_sm(struct gk20a *g,
+		u32 gpc, u32 tpc, u32 sm);
 void gk20a_resume_all_sms(struct gk20a *g);
 void gk20a_gr_suspend_single_sm(struct gk20a *g,
 		u32 gpc, u32 tpc, u32 sm,
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 4cabf2148..04c8824bd 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -1633,4 +1633,5 @@ void gm20b_init_gr(struct gpu_ops *gops)
 	gops->gr.sm_debugger_attached = gk20a_gr_sm_debugger_attached;
 	gops->gr.suspend_single_sm = gk20a_gr_suspend_single_sm;
 	gops->gr.suspend_all_sms = gk20a_gr_suspend_all_sms;
+	gops->gr.resume_single_sm = gk20a_gr_resume_single_sm;
 }
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index afd3750b5..a1be22dff 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -1860,7 +1860,7 @@ static int gr_gp10b_pre_process_sm_exception(struct gk20a *g,
 			gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg,
 					"CILP: resume for gpc %d tpc %d\n",
 					gpc, tpc);
-			gk20a_resume_single_sm(g, gpc, tpc);
+			g->ops.gr.resume_single_sm(g, gpc, tpc, sm);
 
 			*ignore_debugger = true;
 			gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "CILP: All done on gpc %d, tpc %d\n", gpc, tpc);