diff --git a/drivers/gpu/nvgpu/common/pmu/ipc/pmu_msg.c b/drivers/gpu/nvgpu/common/pmu/ipc/pmu_msg.c
index e021fc71b..ae6a121bd 100644
--- a/drivers/gpu/nvgpu/common/pmu/ipc/pmu_msg.c
+++ b/drivers/gpu/nvgpu/common/pmu/ipc/pmu_msg.c
@@ -321,7 +321,8 @@ static int pmu_process_init_msg_fb(struct gk20a *g, struct nvgpu_pmu *pmu,
 	pmu_read_init_msg_fb(g, pmu, tail, PMU_MSG_HDR_SIZE,
 		(void *)&msg->hdr);
 
-	if (msg->hdr.unit_id != PMU_UNIT_INIT_DGPU) {
+	if (msg->hdr.unit_id != PMU_UNIT_INIT_DGPU &&
+			msg->hdr.unit_id != PMU_UNIT_CMDMGMT) {
 		nvgpu_err(g, "FB MSG Q: expecting init msg");
 		err = -EINVAL;
 		goto exit;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/nvgpu_cmdif.h b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/nvgpu_cmdif.h
index f2d9e1eb7..764f3cae4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/nvgpu_cmdif.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/nvgpu_cmdif.h
@@ -28,6 +28,7 @@
 #include "seq.h"
 
 #define PMU_UNIT_REWIND			U8(0x00)
+#define PMU_UNIT_CMDMGMT		U8(0x01)
 #define PMU_UNIT_PG			U8(0x03)
 #define PMU_UNIT_INIT			U8(0x07)
 #define PMU_UNIT_ACR			U8(0x0A)