diff --git a/drivers/gpu/nvgpu/common/pmu/fw/fw.c b/drivers/gpu/nvgpu/common/pmu/fw/fw.c
index fe21f1587..ca0b25449 100644
--- a/drivers/gpu/nvgpu/common/pmu/fw/fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/fw/fw.c
@@ -68,7 +68,7 @@ void nvgpu_pmu_fw_state_change(struct gk20a *g, struct nvgpu_pmu *pmu,
 	if (post_change_event) {
 		if (g->can_elpg) {
 			pmu->pg->pg_init.state_change = true;
-			nvgpu_cond_signal(&pmu->pg->pg_init.wq);
+			nvgpu_cond_signal_interruptible(&pmu->pg->pg_init.wq);
 		}
 	}
 }
diff --git a/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c b/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c
index f6b7c27b5..cc3a43819 100644
--- a/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c
+++ b/drivers/gpu/nvgpu/common/pmu/perf/perf_gv100.c
@@ -75,7 +75,7 @@ static int gv100_pmu_handle_perf_event(struct gk20a *g, void *pmumsg)
 	switch (msg->msg_type) {
 	case NV_PMU_PERF_MSG_ID_VFE_CALLBACK:
 		perf_pmu->vfe_init.state_change = true;
-		nvgpu_cond_signal(&perf_pmu->vfe_init.wq);
+		nvgpu_cond_signal_interruptible(&perf_pmu->vfe_init.wq);
 		break;
 	default:
 		WARN_ON(true);
diff --git a/drivers/gpu/nvgpu/common/pmu/perf/perf_ps35.c b/drivers/gpu/nvgpu/common/pmu/perf/perf_ps35.c
index 6322fcc4c..7323bf792 100644
--- a/drivers/gpu/nvgpu/common/pmu/perf/perf_ps35.c
+++ b/drivers/gpu/nvgpu/common/pmu/perf/perf_ps35.c
@@ -64,7 +64,7 @@ static int tu104_pmu_handle_perf_event(struct gk20a *g, void *pmumsg)
 	switch (msg->rpc_hdr.function) {
 	case NV_PMU_RPC_ID_PERF_VFE_CALLBACK:
 		perf_pmu->vfe_init.state_change = true;
-		(void) nvgpu_cond_signal(&perf_pmu->vfe_init.wq);
+		(void) nvgpu_cond_signal_interruptible(&perf_pmu->vfe_init.wq);
 		break;
 	case NV_PMU_RPC_ID_PERF_SEQ_COMPLETION:
 		nvgpu_log_info(g, "Change Seq Completed");