diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a025138b0992..be21fb8ebb04 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -260,6 +260,15 @@ config PGTABLE_LEVELS
 	default 3 if ARM64_16K_PAGES && ARM64_VA_BITS_47
 	default 4 if !ARM64_64K_PAGES && ARM64_VA_BITS_48
 
+config MSM_GVM
+	bool "Enable virtualization Support for MSM kernel"
+	help
+	  This enables support for MSM Kernel based virtual
+	  machine for any platform.
+	  This helps to enable virtual driver support.
+	  This should work on 64bit machine.
+	  If you don't know what to do here, say N.
+
 config MSM_GVM_QUIN
 	bool "Enable virtualization Support for MSM kernel required for QUIN platform"
 	help
diff --git a/arch/arm64/configs/msm-auto-gvm-perf_defconfig b/arch/arm64/configs/msm-auto-gvm-perf_defconfig
index d93941991c01..dda4a86c89f4 100644
--- a/arch/arm64/configs/msm-auto-gvm-perf_defconfig
+++ b/arch/arm64/configs/msm-auto-gvm-perf_defconfig
@@ -1,3 +1,4 @@
+CONFIG_MSM_GVM=y
 CONFIG_LOCALVERSION="-perf"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
@@ -267,7 +268,6 @@ CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_DRM=y
-# CONFIG_DRM_MSM is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
diff --git a/arch/arm64/configs/msm-auto-gvm_defconfig b/arch/arm64/configs/msm-auto-gvm_defconfig
index 30a163c9743b..640083b94a22 100644
--- a/arch/arm64/configs/msm-auto-gvm_defconfig
+++ b/arch/arm64/configs/msm-auto-gvm_defconfig
@@ -1,3 +1,4 @@
+CONFIG_MSM_GVM=y
 CONFIG_SYSVIPC=y
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
@@ -259,7 +260,6 @@ CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_DRM=y
-# CONFIG_DRM_MSM is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
diff --git a/drivers/gpu/drm/msm-hyp/Kconfig b/drivers/gpu/drm/msm-hyp/Kconfig
index 676c0174c0ee..2a40a4bf036a 100644
--- a/drivers/gpu/drm/msm-hyp/Kconfig
+++ b/drivers/gpu/drm/msm-hyp/Kconfig
@@ -6,7 +6,7 @@
 config DRM_MSM_HYP
 	tristate "MSM DRM HYP"
 	depends on DRM
-	depends on MSM_GVM_QUIN
+	depends on MSM_GVM
 	depends on OF
 	default y
 	help
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index cb3b25ddd0da..5d390abef6bd 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -4,6 +4,7 @@ config DRM_MSM
 	depends on DRM
 	depends on ARCH_QCOM || (ARM && COMPILE_TEST)
 	depends on OF
+	depends on !MSM_GVM
 	select REGULATOR
 	select DRM_KMS_HELPER
 	select DRM_PANEL