diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
index 4832382ec..b26275eda 100644
--- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c
+++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c
@@ -142,7 +142,7 @@ static int nvgpu_sw_quiesce_init_support(struct gk20a *g)
 	return 0;
 }
 
-static void nvgpu_sw_quiesce_remove_support(struct gk20a *g)
+void nvgpu_sw_quiesce_remove_support(struct gk20a *g)
 {
 #ifndef CONFIG_NVGPU_RECOVERY
 	if (g->sw_quiesce_init_done) {
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
index 25d2fd796..a8d3d3a12 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_init.h
@@ -128,6 +128,18 @@ int nvgpu_prepare_poweroff(struct gk20a *g);
  */
 void nvgpu_sw_quiesce(struct gk20a *g);
 
+/**
+ * @brief Cleanup SW Quiesce state
+ *
+ * @param g [in] The GPU
+ *
+ * If SW Quiesce was previously initialized:
+ * - Stop the quiesce thread.
+ * - Destroy cond object.
+ * - Mark Quiesce as uninitialized.
+ */
+void nvgpu_sw_quiesce_remove_support(struct gk20a *g);
+
 /**
  * @brief Start GPU idle
  *