From patchwork Mon Sep 7 17:00:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 46678 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8AMI1DP016216 for ; Thu, 10 Sep 2009 22:18:01 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CB229F302; Mon, 7 Sep 2009 02:01:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fmsmga102.fm.intel.com (mga10.intel.com [192.55.52.92]) by gabe.freedesktop.org (Postfix) with ESMTP id B11559ED30 for ; Mon, 7 Sep 2009 02:01:22 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 07 Sep 2009 01:50:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,345,1249282800"; d="scan'208";a="491156701" Received: from unknown (HELO localhost.localdomain) ([10.239.48.56]) by fmsmga002.fm.intel.com with ESMTP; 07 Sep 2009 01:53:37 -0700 From: Zhenyu Wang To: intel-gfx@lists.freedesktop.org Date: Tue, 8 Sep 2009 01:00:01 +0800 Message-Id: <1252342802-10103-4-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1252342802-10103-3-git-send-email-zhenyuw@linux.intel.com> References: <1252342802-10103-1-git-send-email-zhenyuw@linux.intel.com> <1252342802-10103-2-git-send-email-zhenyuw@linux.intel.com> <1252342802-10103-3-git-send-email-zhenyuw@linux.intel.com> Subject: [Intel-gfx] [PATCH] Add B43 chipset support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Signed-off-by: Zhenyu Wang --- src/common.h | 7 ++++++- src/i810_driver.c | 3 +++ src/i830_driver.c | 5 +++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/src/common.h b/src/common.h index 69f5604..79c656a 100644 --- a/src/common.h +++ b/src/common.h @@ -310,6 +310,11 @@ extern int I810_DEBUG; #define PCI_CHIP_G41_G_BRIDGE 0x2E30 #endif +#ifndef PCI_CHIP_B43_G +#define PCI_CHIP_B43_G 0x2E42 +#define PCI_CHIP_B43_G_BRIDGE 0x2E40 +#endif + #ifndef PCI_CHIP_IGDNG_D_G #define PCI_CHIP_IGDNG_D_G 0x0042 #define PCI_CHIP_IGDNG_D_G_BRIDGE 0x0040 @@ -346,7 +351,7 @@ extern int I810_DEBUG; #define IS_IGDG(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_G) #define IS_IGD(pI810) (IS_IGDG(pI810) || IS_IGDGM(pI810)) #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM) -#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || IS_GM45(pI810)) +#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G || IS_GM45(pI810)) #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME) #define IS_965_Q(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q) #define IS_IGDNG_D(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_D_G) diff --git a/src/i810_driver.c b/src/i810_driver.c index 7961c3d..bb3bad8 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -137,6 +137,7 @@ static const struct pci_id_match intel_device_match[] = { INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ), + INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ), { 0, 0, 0 }, @@ -190,6 +191,7 @@ static SymTabRec I810Chipsets[] = { {PCI_CHIP_G45_G, "G45/G43"}, {PCI_CHIP_Q45_G, "Q45/Q43"}, {PCI_CHIP_G41_G, "G41"}, + {PCI_CHIP_B43_G, "B43"}, {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, {PCI_CHIP_IGDNG_M_G, "Arrandale"}, {-1, NULL} @@ -228,6 +230,7 @@ static PciChipsets I810PciChipsets[] = { {PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL}, {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL}, {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL}, + {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL}, {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL}, {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL}, {-1, -1, NULL } diff --git a/src/i830_driver.c b/src/i830_driver.c index 4334de6..e3e1ed2 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -116,6 +116,7 @@ static SymTabRec I830Chipsets[] = { {PCI_CHIP_G45_G, "G45/G43"}, {PCI_CHIP_Q45_G, "Q45/Q43"}, {PCI_CHIP_G41_G, "G41"}, + {PCI_CHIP_B43_G, "B43"}, {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, {PCI_CHIP_IGDNG_M_G, "Arrandale"}, {-1, NULL} @@ -148,6 +149,7 @@ static PciChipsets I830PciChipsets[] = { {PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL}, {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL}, {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL}, + {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL}, {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL}, {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL}, {-1, -1, NULL} @@ -1096,6 +1098,9 @@ i830_detect_chipset(ScrnInfoPtr pScrn) case PCI_CHIP_G41_G: chipname = "G41"; break; + case PCI_CHIP_B43_G: + chipname = "B43"; + break; case PCI_CHIP_IGDNG_D_G: chipname = "Clarkdale"; break;