diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c
index 6b0f2ac23..2d40002be 100644
--- a/drivers/gpu/nvgpu/common/gr/gr.c
+++ b/drivers/gpu/nvgpu/common/gr/gr.c
@@ -784,3 +784,20 @@ int nvgpu_gr_halt_pipe(struct gk20a *g)
 	return g->ops.gr.falcon.ctrl_ctxsw(g,
 				NVGPU_GR_FALCON_METHOD_HALT_PIPELINE, 0U, NULL);
 }
+
+void nvgpu_gr_remove_support(struct gk20a *g)
+{
+	if (g->gr->remove_support != NULL) {
+		g->gr->remove_support(g);
+	}
+}
+
+void nvgpu_gr_sw_ready(struct gk20a *g, bool enable)
+{
+	g->gr->sw_ready = enable;
+}
+
+void nvgpu_gr_override_ecc_val(struct gk20a *g, u32 ecc_val)
+{
+	g->gr->fecs_feature_override_ecc_val = ecc_val;
+}
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h b/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
index 0d327d956..f10e31332 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gr/gr.h
@@ -25,6 +25,8 @@
 
 #include <nvgpu/types.h>
 
+struct gk20a;
+
 int nvgpu_gr_prepare_sw(struct gk20a *g);
 int nvgpu_gr_enable_hw(struct gk20a *g);
 int nvgpu_gr_reset(struct gk20a *g);
@@ -40,5 +42,7 @@ void nvgpu_gr_free(struct gk20a *g);
 int nvgpu_gr_disable_ctxsw(struct gk20a *g);
 int nvgpu_gr_enable_ctxsw(struct gk20a *g);
 int nvgpu_gr_halt_pipe(struct gk20a *g);
-
+void nvgpu_gr_remove_support(struct gk20a *g);
+void nvgpu_gr_sw_ready(struct gk20a *g, bool enable);
+void nvgpu_gr_override_ecc_val(struct gk20a *g, u32 ecc_val);
 #endif /* NVGPU_GR_H */
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index 768941d36..80d05441f 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -52,7 +52,6 @@
 #include <nvgpu/pmu/pmu_pstate.h>
 #include <nvgpu/cyclestats_snapshot.h>
 
-#include "common/gr/gr_priv.h"
 #include "platform_gk20a.h"
 #include "sysfs.h"
 #include "vgpu/vgpu_linux.h"
@@ -760,8 +759,7 @@ void gk20a_remove_support(struct gk20a *g)
 		g->sec2.remove_support(&g->sec2);
 	}
 
-	if (g->gr->remove_support)
-		g->gr->remove_support(g);
+	nvgpu_gr_remove_support(g);
 
 	if (g->mm.remove_ce_support)
 		g->mm.remove_ce_support(&g->mm);
@@ -1236,7 +1234,7 @@ void gk20a_driver_start_unload(struct gk20a *g)
 	nvgpu_set_enabled(g, NVGPU_DRIVER_IS_DYING, true);
 	/* GR SW ready needs to be invalidated at this time with the busy lock
 	 * held to prevent a racing condition on the gr/mm code */
-	g->gr->sw_ready = false;
+	nvgpu_gr_sw_ready(g, false);
 	g->sw_ready = false;
 	up_write(&l->busy_lock);
 
@@ -1286,7 +1284,7 @@ static int nvgpu_read_fuse_overrides(struct gk20a *g)
 			g->tpc_fs_mask_user = ~value;
 			break;
 		case GP10B_FUSE_OPT_ECC_EN:
-			g->gr->fecs_feature_override_ecc_val = value;
+			nvgpu_gr_override_ecc_val(g, value);
 			break;
 		default:
 			nvgpu_err(g, "ignore unknown fuse override %08x", fuse);
diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index 6acf35b79..29312632b 100644
--- a/drivers/gpu/nvgpu/os/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
@@ -26,6 +26,7 @@
 #include <nvgpu/gr/config.h>
 #include <nvgpu/gr/obj_ctx.h>
 #include <nvgpu/gr/gr_falcon.h>
+#include <nvgpu/gr/gr.h>
 #include <nvgpu/power_features/cg.h>
 #include <nvgpu/power_features/pg.h>
 #include <nvgpu/pmu/pmu_perfmon.h>
@@ -898,7 +899,7 @@ static ssize_t tpc_fs_mask_store(struct device *dev,
 
 		nvgpu_gr_config_deinit(g, g->gr->config);
 		/* Cause next poweron to reinit just gr */
-		g->gr->sw_ready = false;
+		nvgpu_gr_sw_ready(g, false);
 	}
 
 	return count;