diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index ac4963a36980..ed1259af0966 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -50,6 +50,7 @@ CONFIG_MSM_DISPCC_LAHAINA=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_MSM_GPUCC_LAHAINA=m
 CONFIG_MSM_GLOBAL_SYNX=m
+CONFIG_MSM_CVP=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_USB_MSM_SSPHY_QMP=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 81d7cb774aba..f0320692beb0 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -24,5 +24,6 @@ CONFIG_QTI_DDR_STATS_LOG=y
 CONFIG_ARM_QCOM_LPM_CPUIDLE=y
 # CONFIG_ARM_CPUIDLE is not set
 CONFIG_MSM_GLOBAL_SYNX=y
+CONFIG_MSM_CVP=y
 CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_MSM_BT_POWER=m