UBUNTU: [Config] CONFIG_DRM_VBOXVIDEO=n

BugLink: http://bugs.launchpad.net/bugs/1718679
This driver is causing problems for virtualbox guests running
wayland, so disable the driver until these issues are fixed.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 2f56c42039453af00130063df16bed5411db6410..f40d4a828b0b5f785c787273ab2dca2c7845d83e 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7075,10 +7075,11 @@ CONFIG_WILC1000_HW_OOB_INTR                     policy<{'amd64': 'y', 'arm64': '
 CONFIG_KS7010                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_CRYPTO_DEV_CCREE                         policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_CCREE_FIPS_SUPPORT                       policy<{'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
-CONFIG_DRM_VBOXVIDEO                            policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_DRM_VBOXVIDEO                            policy<{'amd64': 'n', 'i386': 'n'}>
 #
 CONFIG_STAGING                                  flag<REVIEW>
 CONFIG_LUSTRE_FS                                flag<REVIEW>
+CONFIG_DRM_VBOXVIDEO                            note<LP:1718679> flag<REVIEW>
 
 # Menu: Device Drivers >> Staging drivers >> Android
 

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 561b93858f5119186b831981029152bfe962eece..27c5288faae00be15e0fe2f15b0b92a437ea67af 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2301,7 +2301,7 @@ CONFIG_DRM_TI_TFP410=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TTM=m
 CONFIG_DRM_UDL=m
-CONFIG_DRM_VBOXVIDEO=m
+# CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_DRM_VC4=m
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VIRTIO_GPU=m