From patchwork Wed Oct 13 08:21:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ike Panhc X-Patchwork-Id: 67659 X-Patchwork-Delegate: stefan.bader@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 C8A3CB6EDF for ; Wed, 13 Oct 2010 19:21:57 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P5wav-00039p-9N; Wed, 13 Oct 2010 09:21:53 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1P5wat-00038g-2W for kernel-team@lists.ubuntu.com; Wed, 13 Oct 2010 09:21:51 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1P5was-0006lD-HM for ; Wed, 13 Oct 2010 09:21:50 +0100 Received: from [210.242.151.101] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1P5war-000229-8D for kernel-team@lists.ubuntu.com; Wed, 13 Oct 2010 09:21:50 +0100 From: Ike Panhc To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: SAUCE: drm/i915: Add second set of PCI-IDs for B43 Date: Wed, 13 Oct 2010 16:21:43 +0800 Message-Id: <1286958103-7310-1-git-send-email-ike.pan@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1286182101-5852-1-git-send-email-ike.pan@canonical.com> References: <1286182101-5852-1-git-send-email-ike.pan@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 SRU Justification: Impact: Install Ubuntu Lucid on Intel B43 chipset whose PCI id is 8086:2E90/2E92. X can not start. Fix: Add new id 0x2E92 beside 0x2E42 for i915.ko Commit c96c3a[1] in mainline kernel simplies all info for each device into a single structure, but is landed after 2.6.36 kernel. So we still need to modify IS_GEN4 macro in i915_drv.h. That's why this patch does not look like mainline kernel one[2]. Testcase: Apply this patch on current checkout of Lucid kernel and runs with xserver-xorg-video-intel with the same modification, X start ok. BugLink: http://launchpad.net/bugs/640214 [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=c96c3a8cb7fadcb33d9a5ebe35fcee8b7d0a7946 [2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=41a51428916ab04587bacee2dda61c4a0c4fc02f Signed-off-by: Ike Panhc --- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 4239d68..e304a49 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -165,6 +165,7 @@ const static struct pci_device_id pciidlist[] = { INTEL_VGA_DEVICE(0x2e22, &intel_g45_info), INTEL_VGA_DEVICE(0x2e32, &intel_g45_info), INTEL_VGA_DEVICE(0x2e42, &intel_g45_info), + INTEL_VGA_DEVICE(0x2e92, &intel_g45_info), INTEL_VGA_DEVICE(0xa001, &intel_pineview_info), INTEL_VGA_DEVICE(0xa011, &intel_pineview_info), INTEL_VGA_DEVICE(0x0042, &intel_ironlake_d_info), diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b26d0ed..ecc4fbe 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1067,7 +1067,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); (dev)->pci_device == 0x2E22 || \ (dev)->pci_device == 0x2E32 || \ (dev)->pci_device == 0x2A42 || \ - (dev)->pci_device == 0x2E42) + (dev)->pci_device == 0x2E42 || \ + (dev)->pci_device == 0x2E92) #define I915_NEED_GFX_HWS(dev) (INTEL_INFO(dev)->need_gfx_hws)