From patchwork Wed Apr 15 02:33:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Ruffell X-Patchwork-Id: 1270822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4925yq5Vryz9sSb; Wed, 15 Apr 2020 12:34:09 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jOXsI-0005xv-UZ; Wed, 15 Apr 2020 02:34:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jOXsH-0005xL-Nz for kernel-team@lists.ubuntu.com; Wed, 15 Apr 2020 02:34:01 +0000 Received: from mail-pl1-f199.google.com ([209.85.214.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jOXsH-0007ty-BJ for kernel-team@lists.ubuntu.com; Wed, 15 Apr 2020 02:34:01 +0000 Received: by mail-pl1-f199.google.com with SMTP id e18so1606561pld.3 for ; Tue, 14 Apr 2020 19:34:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fvg9tqtVstc8Z1DALAY/iKakwcz4Kes6nzyIm+kf5Zo=; b=YNtdPsWJeKKghCRe9w9l+FA0SMP32dodzb9nGtozIQGRRiXoY+bqTru+xhSckR6KbM rUCJr5PJ0QwM00bmFHLs8twG8x+2cylZLjM/tSrazuBk3UjewCyPnkk08O3bet5fn9eV Y7fYLjJ77AyloDtyC7SekVFYjfpThm6qn0pVQlldQ8d3FY81qLA2KNH8WhKFuw5AZjBs 6SXNKWVesSuDjdL8RnnFLcpr33z3bLNK7oFwhCapA+efHfiTMFNGXKgqVxgiXkRvHYUI YBxkenaCjBOyYjNC5HWqC2er3tsOIkFNkgTmFZMLT+grZRQ/EzpvpcZAP/udrilj1sei j11Q== X-Gm-Message-State: AGi0PubgYuleP9hdW686sER1mW/oB6iE6G89KJpffMtCW7Ee2xrlBGIm 4pHCZTFzVjxVCi19tqJ/1cf8sMp98GgrxxI5yGGe3WkFXlwxJrX07tz8L3TBN6k3wbCPZdcy+mk zSfacmBcawVsw/YNSpBppkzadZT+aP9/8t2R9knr5Hw== X-Received: by 2002:a63:2901:: with SMTP id p1mr24297474pgp.444.1586918039876; Tue, 14 Apr 2020 19:33:59 -0700 (PDT) X-Google-Smtp-Source: APiQypI+cWTVyB8+k66l2XacqW5ArGa3VWPRRcYczYmuRn/ydlApvIFCX+BKOY6F5FWRUIb9LJYIFA== X-Received: by 2002:a63:2901:: with SMTP id p1mr24297463pgp.444.1586918039629; Tue, 14 Apr 2020 19:33:59 -0700 (PDT) Received: from localhost.localdomain (222-154-99-146-fibre.sparkbb.co.nz. [222.154.99.146]) by smtp.gmail.com with ESMTPSA id c190sm12009534pfa.66.2020.04.14.19.33.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 19:33:59 -0700 (PDT) From: Matthew Ruffell To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_DRM_BOCHS as module for all archs Date: Wed, 15 Apr 2020 14:33:50 +1200 Message-Id: <20200415023350.15407-2-matthew.ruffell@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415023350.15407-1-matthew.ruffell@canonical.com> References: <20200415023350.15407-1-matthew.ruffell@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 Acked-by: Kleber Sacilotto de Souza Acked-by: Kamal Mostafa --- 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 -CONFIG_DRM_BOCHS note CONFIG_DRM_STI note CONFIG_DRM_HISI_HIBMC note 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