From patchwork Mon Nov 25 01:40:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1200031 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 47LqWV6XXJz9sNx; Mon, 25 Nov 2019 12:41:26 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iZ3NI-0005NS-1l; Mon, 25 Nov 2019 01:41:12 +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 1iZ3NF-0005N8-99 for kernel-team@lists.ubuntu.com; Mon, 25 Nov 2019 01:41:09 +0000 Received: from [222.129.3.255] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iZ3ND-0000We-Tc for kernel-team@lists.ubuntu.com; Mon, 25 Nov 2019 01:41:09 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Eoan][raspi2][PATCH 1/1] UBUNTU: [config] raspi2: Revert "UBUNTU: [config] raspi2: CONFIG_DRM_V3D=m" Date: Mon, 25 Nov 2019 09:40:51 +0800 Message-Id: <20191125014051.7532-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191125014051.7532-1-hui.wang@canonical.com> References: <20191125014051.7532-1-hui.wang@canonical.com> 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" BugLink: https://bugs.launchpad.net/bugs/1853789 The driver v3d is not stable, even the branch rpi-5.3.y doesn't have a stable v3d driver yet. Let us disable it in the kernel, otherwise the driver will crash when users operate something under desktop. We will enable it again after getting the perfect fixes from upstream and doing enough tests. This reverts commit f318b05e384816138f88a78bd7a299f51c986342. Signed-off-by: Hui Wang --- debian.raspi2/config/annotations | 1 - debian.raspi2/config/config.common.ubuntu | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/debian.raspi2/config/annotations b/debian.raspi2/config/annotations index a017e28ea1b1..6c481de85421 100644 --- a/debian.raspi2/config/annotations +++ b/debian.raspi2/config/annotations @@ -1542,7 +1542,6 @@ CONFIG_DRM_TEGRA policy<{'armhf-generic': 'm'}> CONFIG_DRM_TEGRA_DEBUG policy<{'armhf-generic': 'n'}> CONFIG_DRM_TEGRA_STAGING policy<{'armhf-generic': 'y'}> CONFIG_DRM_STI policy<{'armhf': 'n'}> -CONFIG_DRM_V3D policy<{'arm64': 'm', 'armhf': 'm'}>note CONFIG_DRM_VC4 policy<{'arm64': 'm'}> CONFIG_DRM_ETNAVIV policy<{'armhf-generic': 'm'}> CONFIG_DRM_ETNAVIV_REGISTER_LOGGING policy<{'armhf-generic': 'n'}> diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu index 0422f5901067..dc1ff1f98c86 100644 --- a/debian.raspi2/config/config.common.ubuntu +++ b/debian.raspi2/config/config.common.ubuntu @@ -1837,7 +1837,7 @@ CONFIG_DRM_TOSHIBA_TC358767=m CONFIG_DRM_TTM=m CONFIG_DRM_TVE200=m CONFIG_DRM_UDL=m -CONFIG_DRM_V3D=m +# CONFIG_DRM_V3D is not set CONFIG_DRM_VC4=m # CONFIG_DRM_VC4_HDMI_CEC is not set CONFIG_DRM_VGEM=m