diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 19eccf42b..2294a7c79 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2293,23 +2293,6 @@ int gk20a_gr_isr(struct gk20a *g)
 	return 0;
 }
 
-u32 gk20a_gr_nonstall_isr(struct gk20a *g)
-{
-	u32 ops = 0;
-	u32 gr_intr = gk20a_readl(g, gr_intr_nonstall_r());
-
-	nvgpu_log(g, gpu_dbg_intr, "pgraph nonstall intr %08x", gr_intr);
-
-	if ((gr_intr & gr_intr_nonstall_trap_pending_f()) != 0U) {
-		/* Clear the interrupt */
-		gk20a_writel(g, gr_intr_nonstall_r(),
-			gr_intr_nonstall_trap_pending_f());
-		ops |= (GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE |
-			GK20A_NONSTALL_OPS_POST_EVENTS);
-	}
-	return ops;
-}
-
 int gr_gk20a_fecs_get_reglist_img_size(struct gk20a *g, u32 *size)
 {
 	BUG_ON(size == NULL);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 0d416c1cc..188e735f6 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -299,7 +299,6 @@ int gk20a_init_gr_channel(struct channel_gk20a *ch_gk20a);
 int gk20a_alloc_obj_ctx(struct channel_gk20a  *c, u32 class_num, u32 flags);
 
 int gk20a_gr_isr(struct gk20a *g);
-u32 gk20a_gr_nonstall_isr(struct gk20a *g);
 
 /* pmu */
 int gr_gk20a_fecs_get_reglist_img_size(struct gk20a *g, u32 *size);
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 33e272583..90f13b6d1 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -488,6 +488,7 @@ static const struct gpu_ops gm20b_ops = {
 			.enable_gpc_exceptions =
 					gm20b_gr_intr_enable_gpc_exceptions,
 			.enable_exceptions = gm20b_gr_intr_enable_exceptions,
+			.nonstall_isr = gm20b_gr_intr_nonstall_isr,
 		},
 		.falcon = {
 			.fecs_base_addr = gm20b_gr_falcon_fecs_base_addr,
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index e690a6ae7..6ffcc6cda 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -574,6 +574,7 @@ static const struct gpu_ops gp10b_ops = {
 			.enable_gpc_exceptions =
 					gm20b_gr_intr_enable_gpc_exceptions,
 			.enable_exceptions = gm20b_gr_intr_enable_exceptions,
+			.nonstall_isr = gm20b_gr_intr_nonstall_isr,
 		},
 		.falcon = {
 			.fecs_base_addr = gm20b_gr_falcon_fecs_base_addr,
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 3b1ccc15a..c4e984bbe 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -718,6 +718,7 @@ static const struct gpu_ops gv100_ops = {
 			.enable_gpc_exceptions =
 					gv11b_gr_intr_enable_gpc_exceptions,
 			.enable_exceptions = gv11b_gr_intr_enable_exceptions,
+			.nonstall_isr = gm20b_gr_intr_nonstall_isr,
 		},
 		.falcon = {
 			.fecs_base_addr = gm20b_gr_falcon_fecs_base_addr,
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 9e558eb87..42141fc88 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -677,6 +677,7 @@ static const struct gpu_ops gv11b_ops = {
 			.enable_gpc_exceptions =
 					gv11b_gr_intr_enable_gpc_exceptions,
 			.enable_exceptions = gv11b_gr_intr_enable_exceptions,
+			.nonstall_isr = gm20b_gr_intr_nonstall_isr,
 		},
 		.falcon = {
 			.fecs_base_addr = gm20b_gr_falcon_fecs_base_addr,
diff --git a/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.c b/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.c
index f7088e9b0..dd028bf23 100644
--- a/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.c
@@ -23,6 +23,7 @@
 #include <nvgpu/gk20a.h>
 #include <nvgpu/io.h>
 
+#include <nvgpu/gr/gr.h>
 #include <nvgpu/gr/config.h>
 #include <nvgpu/gr/gr.h>
 #include <nvgpu/gr/gr_intr.h>
@@ -59,10 +60,7 @@ u32 gm20b_gr_intr_get_tpc_exception(struct gk20a *g, u32 offset,
 
 void gm20b_gr_intr_handle_tex_exception(struct gk20a *g, u32 gpc, u32 tpc)
 {
-	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);
-	u32 offset = gpc_stride * gpc + tpc_in_gpc_stride * tpc;
+	u32 offset = nvgpu_gr_gpc_offset(g, gpc) + nvgpu_gr_tpc_offset(g, tpc);
 	u32 esr;
 
 	nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg, " ");
@@ -124,3 +122,20 @@ void gm20b_gr_intr_enable_gpc_exceptions(struct gk20a *g,
 
 	nvgpu_writel(g, gr_gpcs_gpccs_gpc_exception_en_r(), tpc_mask);
 }
+
+u32 gm20b_gr_intr_nonstall_isr(struct gk20a *g)
+{
+	u32 ops = 0;
+	u32 gr_intr = nvgpu_readl(g, gr_intr_nonstall_r());
+
+	nvgpu_log(g, gpu_dbg_intr, "pgraph nonstall intr %08x", gr_intr);
+
+	if ((gr_intr & gr_intr_nonstall_trap_pending_f()) != 0U) {
+		/* Clear the interrupt */
+		nvgpu_writel(g, gr_intr_nonstall_r(),
+			gr_intr_nonstall_trap_pending_f());
+		ops |= (GK20A_NONSTALL_OPS_WAKEUP_SEMAPHORE |
+			GK20A_NONSTALL_OPS_POST_EVENTS);
+	}
+	return ops;
+}
diff --git a/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.h b/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.h
index a4bcfef47..95458e3a4 100644
--- a/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/gr/intr/gr_intr_gm20b.h
@@ -39,5 +39,6 @@ void gm20b_gr_intr_enable_exceptions(struct gk20a *g,
 				     bool enable);
 void gm20b_gr_intr_enable_gpc_exceptions(struct gk20a *g,
 					 struct nvgpu_gr_config *gr_config);
+u32 gm20b_gr_intr_nonstall_isr(struct gk20a *g);
 
 #endif /* NVGPU_GR_INTR_GM20B_H */
diff --git a/drivers/gpu/nvgpu/hal/mc/mc_gm20b.c b/drivers/gpu/nvgpu/hal/mc/mc_gm20b.c
index 7c019ca86..3be9dadbe 100644
--- a/drivers/gpu/nvgpu/hal/mc/mc_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/mc/mc_gm20b.c
@@ -111,7 +111,7 @@ u32 gm20b_mc_isr_nonstall(struct gk20a *g)
 			engine_enum = engine_info->engine_enum;
 			/* GR Engine */
 			if (engine_enum == NVGPU_ENGINE_GR_GK20A) {
-				ops |= gk20a_gr_nonstall_isr(g);
+				ops |= g->ops.gr.intr.nonstall_isr(g);
 			}
 			/* CE Engine */
 			if (((engine_enum == NVGPU_ENGINE_GRCE_GK20A) ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index 1ffcaf3e9..29b5b8ede 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -799,6 +799,7 @@ struct gpu_ops {
 					bool enable);
 			void (*enable_gpc_exceptions)(struct gk20a *g,
 					struct nvgpu_gr_config *gr_config);
+			u32 (*nonstall_isr)(struct gk20a *g);
 		} intr;
 
 		u32 (*get_ctxsw_checksum_mismatch_mailbox_val)(void);