diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 990a151..8b80cd3 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/pm_domain.h>
 #include <linux/pm_runtime.h>
 #include <media/videobuf2-v4l2.h>
 #include <media/v4l2-mem2mem.h>
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 48c9084..6ede5e9 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -455,6 +455,10 @@ static int poweroff_coreid(struct venus_core *core, unsigned int coreid_mask)
 		if (ret)
 			return ret;
 
+		ret = dev_pm_genpd_set_hwmode(core->pmdomains[1], false);
+		if (ret)
+			return ret;
+
 		ret = pm_runtime_put_sync(core->pmdomains[1]);
 		if (ret < 0)
 			return ret;
@@ -471,6 +475,10 @@ static int poweroff_coreid(struct venus_core *core, unsigned int coreid_mask)
 		if (ret)
 			return ret;
 
+		ret = dev_pm_genpd_set_hwmode(core->pmdomains[2], false);
+		if (ret)
+			return ret;
+
 		ret = pm_runtime_put_sync(core->pmdomains[2]);
 		if (ret < 0)
 			return ret;
@@ -488,6 +496,10 @@ static int poweron_coreid(struct venus_core *core, unsigned int coreid_mask)
 		if (ret < 0)
 			return ret;
 
+		ret = dev_pm_genpd_set_hwmode(core->pmdomains[1], true);
+		if (ret)
+			return ret;
+
 		ret = vcodec_control_v4(core, VIDC_CORE_ID_1, true);
 		if (ret)
 			return ret;
@@ -506,6 +518,10 @@ static int poweron_coreid(struct venus_core *core, unsigned int coreid_mask)
 		if (ret < 0)
 			return ret;
 
+		ret = dev_pm_genpd_set_hwmode(core->pmdomains[2], true);
+		if (ret)
+			return ret;
+
 		ret = vcodec_control_v4(core, VIDC_CORE_ID_2, true);
 		if (ret)
 			return ret;