From patchwork Wed Oct 3 11:22:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 978215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=none (p=none dis=none) header.from=ubuntu.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 42QDBy2pQjz9sBN; Wed, 3 Oct 2018 21:22:34 +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 1g7fEU-0000Gf-Nz; Wed, 03 Oct 2018 11:22:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1g7fET-0000GZ-NL for kernel-team@lists.ubuntu.com; Wed, 03 Oct 2018 11:22:21 +0000 Received: from xdsl-77-86-196-137.nebulazone.fi ([77.86.196.137] helo=leon.tyrell) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1g7fET-0004Q8-CJ for kernel-team@lists.ubuntu.com; Wed, 03 Oct 2018 11:22:21 +0000 From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] Re-enable CONFIG_DRM_BOCHS Date: Wed, 3 Oct 2018 14:22:20 +0300 Message-Id: <20181003112220.820-1-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.17.1 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Timo Aaltonen BugLink: https://bugs.launchpad.net/bugs/1795857 This is required for xserver to work on QEMU with dummy VGA. Signed-off-by: Timo Aaltonen --- debian.master/config/annotations | 2 -- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 93813c874627..4d11ae71c875 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1822,7 +1822,6 @@ 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_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'}> @@ -1848,7 +1847,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 # 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 bdece4b92c89..e6e1f5d34ea1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2315,7 +2315,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_CDNS_DSI=m CONFIG_DRM_CIRRUS_QEMU=m