diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index d203a335d..2d09c0bbf 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -192,6 +192,14 @@ int gk20a_finalize_poweron(struct gk20a *g)
 		}
 	}
 
+	if (g->ops.fb.mem_unlock) {
+		err = g->ops.fb.mem_unlock(g);
+		if (err) {
+			nvgpu_err(g, "failed to unlock memory");
+			goto done;
+		}
+	}
+
 	err = g->ops.fifo.reset_enable_hw(g);
 
 	if (err) {
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 3fcad1cfa..c04c97caf 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -445,6 +445,7 @@ struct gpu_ops {
 		void (*set_debug_mode)(struct gk20a *g, bool enable);
 		void (*tlb_invalidate)(struct gk20a *g, struct nvgpu_mem *pdb);
 		void (*hub_isr)(struct gk20a *g);
+		int (*mem_unlock)(struct gk20a *g);
 	} fb;
 	struct {
 		void (*slcg_bus_load_gating_prod)(struct gk20a *g, bool prod);
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index e146d3caf..269fd7f14 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -308,6 +308,7 @@ static const struct gpu_ops gm20b_ops = {
 		.is_debug_mode_enabled = gm20b_fb_debug_mode_enabled,
 		.set_debug_mode = gm20b_fb_set_debug_mode,
 		.tlb_invalidate = gk20a_fb_tlb_invalidate,
+		.mem_unlock = NULL,
 	},
 	.clock_gating = {
 		.slcg_bus_load_gating_prod =
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 54960b964..1246ee7f1 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -373,6 +373,7 @@ static const struct gpu_ops gp106_ops = {
 		.is_debug_mode_enabled = gm20b_fb_debug_mode_enabled,
 		.set_debug_mode = gm20b_fb_set_debug_mode,
 		.tlb_invalidate = gk20a_fb_tlb_invalidate,
+		.mem_unlock = NULL,
 	},
 	.clock_gating = {
 		.slcg_bus_load_gating_prod =
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index b40ce4a18..b80722b87 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -327,6 +327,7 @@ static const struct gpu_ops gp10b_ops = {
 		.is_debug_mode_enabled = gm20b_fb_debug_mode_enabled,
 		.set_debug_mode = gm20b_fb_set_debug_mode,
 		.tlb_invalidate = gk20a_fb_tlb_invalidate,
+		.mem_unlock = NULL,
 	},
 	.clock_gating = {
 		.slcg_bus_load_gating_prod =