From patchwork Fri Apr 16 17:09:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 50341 X-Patchwork-Delegate: apw@canonical.com 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 F30D6B7D48 for ; Sat, 17 Apr 2010 03:09:27 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O2p2f-0006k9-AG; Fri, 16 Apr 2010 18:09:21 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O2p2d-0006jS-2m for kernel-team@lists.ubuntu.com; Fri, 16 Apr 2010 18:09:19 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O2p2d-0000C3-0d for ; Fri, 16 Apr 2010 18:09:19 +0100 Received: from 79-70-21-78.dynamic.dsl.as9105.com ([79.70.21.78] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1O2p2c-0004Z1-SJ for kernel-team@lists.ubuntu.com; Fri, 16 Apr 2010 18:09:18 +0100 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/6] UBUNTU: SAUCE: radeon KMS -- blacklist ES1000 Date: Fri, 16 Apr 2010 18:09:15 +0100 Message-Id: <1271437755-16680-7-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271437755-16680-1-git-send-email-apw@canonical.com> References: <1271437755-16680-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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 BugLink: http://bugs.launchpad.net/bugs/546743 Signed-off-by: Andy Whitcroft --- drivers/gpu/drm/radeon/radeon_drv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 2486f37..aa985a6 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -327,6 +327,8 @@ static int __init radeon_init(void) /* Check for known bad devices by default. */ if (radeon_modeset == -1) { static struct pci_device_id radeon_badmodeset[] = { + { PCI_DEVICE(0x1002, 0x515e) }, + { PCI_DEVICE(0x1002, 0x515f) }, { }, }; if (pci_dev_present(radeon_badmodeset)) {