UBUNTU: [Config] Enable CONFIG_DRM_MGAG200 as module

BugLink: http://bugs.launchpad.net/bugs/1693337
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 4677852879498a035ddc282d34d2594a5698d2c3..82759292d3bd8139e838deea42bab1127f17fd7c 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1485,7 +1485,7 @@ CONFIG_DRM_VMWGFX                               policy<{'amd64': 'm', 'i386': 'm
 CONFIG_DRM_VMWGFX_FBCON                         policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_DRM_UDL                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_DRM_AST                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
-CONFIG_DRM_MGAG200                              policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
+CONFIG_DRM_MGAG200                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_DRM_CIRRUS_QEMU                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
 CONFIG_DRM_ARMADA                               policy<{'armhf': 'm'}>
 CONFIG_DRM_ATMEL_HLCDC                          policy<{'armhf': 'm'}>
@@ -1512,7 +1512,7 @@ CONFIG_DRM_MEDIATEK_HDMI                        policy<{'arm64': 'm', 'armhf': '
 CONFIG_DRM_MXSFB                                policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_DRM_MESON                                policy<{'armhf': 'm'}>
 #
-CONFIG_DRM_MGAG200                              mark<ENFORCED> note<LP#1042903: CONFIG_DRM_MGAG200, experimental driver hangs boot on HP Proliant Gen8>
+CONFIG_DRM_MGAG200                              note<LP#1693337>
 CONFIG_DRM_BOCHS                                note<LP#1378648>
 CONFIG_DRM_STI                                  note<LP#1398458>
 CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT          note<LP:1473319>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4edaf6341f296152cfe841d2e7d335f9c604f141..4871d3cdb9944ada8dbf653308e213ea20e1abe3 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2136,7 +2136,7 @@ CONFIG_DRM_MEDFIELD=y
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
 CONFIG_DRM_MESON=m
-# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_MGAG200=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_DSI=y