From patchwork Fri Apr 1 12:09:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luke Yelavich X-Patchwork-Id: 89254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 8A2CEB6F7E for ; Fri, 1 Apr 2011 23:11:01 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q5dBo-0002Wl-An; Fri, 01 Apr 2011 12:10:56 +0000 Received: from nskntmtas06p.mx.bigpond.com ([61.9.168.152]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Q5dBk-0002Vo-Iu for kernel-team@lists.ubuntu.com; Fri, 01 Apr 2011 12:10:53 +0000 Received: from nskntotgx03p.mx.bigpond.com ([58.160.38.86]) by nskntmtas06p.mx.bigpond.com with ESMTP id <20110401121050.QBZV932.nskntmtas06p.mx.bigpond.com@nskntotgx03p.mx.bigpond.com>; Fri, 1 Apr 2011 12:10:50 +0000 Received: from strigy.yelavich.home ([58.160.38.86]) by nskntotgx03p.mx.bigpond.com with ESMTP id <20110401121050.ZEEB9786.nskntotgx03p.mx.bigpond.com@strigy.yelavich.home>; Fri, 1 Apr 2011 12:10:50 +0000 From: Luke Yelavich To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: [Config] Disable CONFIG_DRM_RADEON_KMS on powerpc kernels Date: Fri, 1 Apr 2011 23:09:37 +1100 Message-Id: <1301659778-14070-3-git-send-email-themuso@ubuntu.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1301659778-14070-1-git-send-email-themuso@ubuntu.com> References: <1301659778-14070-1-git-send-email-themuso@ubuntu.com> X-SIH-MSG-ID: ox4zGd32TAD0zmZ50TCxOw4nyF2wq3gv8ZoaRdJiqQQbRFjLv9GoAZOzAuMD0Z7nxD9OPBuFNGQgc67kXI7r X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Radeon KMS on powerpc gives an oops on startup, leaving the user with a blank screen. Disable KMS for now so that machines with radeon hardware will at least work in the console/X. Signed-off-by: Luke Yelavich --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 6 files changed, 5 insertions(+), 1 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index bff2b5b..eee711d 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -68,6 +68,7 @@ CONFIG_DM_RAID45=m CONFIG_DM_SNAPSHOT=y CONFIG_DRM_NOUVEAU=m CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y CONFIG_DT3155=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 80f2921..9202d76 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -51,6 +51,7 @@ CONFIG_DM_MULTIPATH=y CONFIG_DM_SNAPSHOT=y # CONFIG_DRM_NOUVEAU is not set # CONFIG_DRM_RADEON is not set +CONFIG_DRM_RADEON_KMS=y # CONFIG_DT3155 is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_ECHO=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ddba078..d82e93d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1194,7 +1194,6 @@ CONFIG_DRM_MGA=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_NOUVEAU_DEBUG=y CONFIG_DRM_R128=m -CONFIG_DRM_RADEON_KMS=y CONFIG_DRM_SAVAGE=m CONFIG_DRM_SIS=m CONFIG_DRM_TDFX=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 26fba1c..75ff0b4 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -67,6 +67,7 @@ CONFIG_DM_RAID45=m CONFIG_DM_SNAPSHOT=y CONFIG_DRM_NOUVEAU=m CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y CONFIG_DT3155=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1b901f4..a3723f9 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -61,6 +61,7 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_KMS is not set # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y # CONFIG_DVB_USB_EC168 is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 4914ef9..b1dcede 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -66,6 +66,7 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_KMS=y # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y # CONFIG_DVB_USB_EC168 is not set