ACK/cmnt: [SRU][Bionic][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_DRM_BOCHS as module for all archs

[Kleber Souza]

On 15.04.20 04:33, Matthew Ruffell wrote:
> BugLink: https://bugs.launchpad.net/bugs/1872863
> 
> A recent grub2 SRU, LP #1864533, has forced the kernel to boot via the efi
> stub, instead of the grub linux loader. This causes problems for QEMU/KVM
> virtual machines which use the VGA=std video device, as the efifb driver
> yields an unreadable garbled screen. The correct framebuffer driver in
> this situation is bochs-drm, and modprobing it fixes the issues.
> 
> CONFIG_DRM_BOCHS was disabled in LP #1378648 due to bochs-drm causing problems
> in a PowerKVM machine. This problem appears to be fixed now, and bochs-drm
> has been re-enabled for Disco and up, in LP #1795857 and has been proven safe.
> 
> Re-enable bochs-drm again as a module for all architectures to ensure that
> QEMU/KVM virtual machines with VGA=std video settings have a functional
> framebuffer.
> 
> Signed-off-by: Matthew Ruffell <matthew.ruffell at canonical.com>

This change looks good to me, however I would like to see some test results
on a ppc64el machine with Bionic before we commit this patch. So we would
avoid re-spinning the kernel in the future in case this is not really
fixed on PowerKVM.

Acked-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>

> ---
>  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 d4ba76f3a350..4443dae5b9b5 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -1743,7 +1743,7 @@ CONFIG_DRM_SHMOBILE                             policy<{'armhf': 'm'}>
>  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'}>
> -CONFIG_DRM_BOCHS                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
> +CONFIG_DRM_BOCHS                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_DRM_VIRTIO_GPU                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
>  CONFIG_DRM_FSL_DCU                              policy<{'armhf': 'm'}>
>  CONFIG_DRM_TEGRA                                policy<{'armhf-generic': 'm'}>
> @@ -1769,7 +1769,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>

Instead of removing the note, I would change the bug number to LP#1872863,
so the note about the rationale behind this choice is kept.

>  CONFIG_DRM_STI                                  note<LP#1398458>
>  CONFIG_DRM_HISI_HIBMC                           note<LP#1762940>
>  
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 865a77cfb9f6..3acc825aac9f 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2249,7 +2249,7 @@ CONFIG_DRM_ARM=y
>  CONFIG_DRM_ARMADA=m
>  CONFIG_DRM_AST=m
>  CONFIG_DRM_ATMEL_HLCDC=m
> -# CONFIG_DRM_BOCHS is not set
> +CONFIG_DRM_BOCHS=m
>  CONFIG_DRM_BRIDGE=y
>  CONFIG_DRM_CIRRUS_QEMU=m
>  # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
>