[PATCH v2] UBUNTU: [Config] Reenable DRM_BOCHS as module

[Thomas Lamprecht]

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1795857

CONFIG_DRM_BOCHS got disabled for LP#1378648 from 2014 which does not
seems to be an issue anymore. On the contrary, disabling it breaks
using Ubuntu in a QEMU/KVM virtuak machine when passing its 'std' VGA
driver.

Re-enable BOCHS again as module to ensure one can use Ubuntu in
QEMU/KVM backed virtual machines in common default settings.

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
Co-developed-by: Timo Aaltonen <tjaalton at ubuntu.com>
---

changes v1 -> v2:
* forgot to stage the change for config.common.ubuntu in git..
* added Co-dev tag for Timo Aaltonen, as he sent the patch already a bit ago,
  wasn't sure about the specific patch so feel free to change/adapt as seen
  reasonable

 debian.master/config/annotations          | 3 +--
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 549fbf487034..a13acf25d964 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1744,7 +1744,7 @@ CONFIG_DRM_RCAR_VSP                             policy<{'arm64': 'y', 'armhf': '
 CONFIG_DRM_OMAP                                 policy<{'armhf': 'n'}>
 CONFIG_DRM_TILCDC                               policy<{'armhf': 'm'}>
 CONFIG_DRM_QXL                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'n'}>
-CONFIG_DRM_BOCHS                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_DRM_BOCHS                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_DRM_VIRTIO_GPU                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_DRM_FSL_DCU                              policy<{'armhf': 'm'}>
 CONFIG_DRM_TEGRA                                policy<{'armhf-generic': 'm'}>
@@ -1770,7 +1770,6 @@ CONFIG_DRM_PL111                                policy<{'arm64': 'm', 'armhf': '
 CONFIG_DRM_TVE200                               policy<{'armhf': 'm'}>
 #
 CONFIG_DRM_MGAG200                              note<LP#1693337>
-CONFIG_DRM_BOCHS                                note<LP#1378648>
 CONFIG_DRM_STI                                  note<LP#1398458>
 
 # Menu: Device Drivers >> Graphics support >> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) >> AMD GPU
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index db0c2340069e..642496fdfbd0 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2380,7 +2380,7 @@ CONFIG_DRM_ARCPGU=m
 CONFIG_DRM_ARM=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
-# CONFIG_DRM_BOCHS is not set
+CONFIG_DRM_BOCHS=m
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_CDNS_DSI=m
 # CONFIG_DRM_DEBUG_MM is not set
-- 
2.20.1