From d5e0fa072c5848549297137aada2bf86e4d7cde7 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 10 May 2011 14:35:02 +0100
Subject: Correct chipset detection for Q33, Q35, B43_G1

Everytime we update these tables we trip over this bit of marketing
genius.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit bb8bf2a28bcb5e838bf4bb7e80ce220d28540719)

Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
---
 src/intel_module.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/intel_module.c b/src/intel_module.c
index 49f8993b..27a193fc 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -150,9 +150,14 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, &intel_i915_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, &intel_i915_info ),
 
-	INTEL_DEVICE_MATCH (PCI_CHIP_G33_G, &intel_g33_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_M, &intel_g33_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_G, &intel_g33_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_G33_G, &intel_g33_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_Q33_G, &intel_g33_info ),
+	/* Another marketing win: Q35 is another g33 device not a gen4 part
+	 * like its G35 brethren.
+	 */
+	INTEL_DEVICE_MATCH (PCI_CHIP_Q35_G, &intel_g33_info ),
 
 	INTEL_DEVICE_MATCH (PCI_CHIP_I965_G, &intel_i965_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_G35_G, &intel_i965_info ),
@@ -160,8 +165,6 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_I946_GZ, &intel_i965_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_I965_GM, &intel_i965_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_I965_GME, &intel_i965_info ),
-	INTEL_DEVICE_MATCH (PCI_CHIP_Q35_G, &intel_i965_info ),
-	INTEL_DEVICE_MATCH (PCI_CHIP_Q33_G, &intel_i965_info ),
 
 	INTEL_DEVICE_MATCH (PCI_CHIP_GM45_GM, &intel_g4x_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_G45_E_G, &intel_g4x_info ),
@@ -169,6 +172,7 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, &intel_g4x_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, &intel_g4x_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, &intel_g4x_info ),
+	INTEL_DEVICE_MATCH (PCI_CHIP_B43_G1, &intel_g4x_info ),
 
 	INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_D_G, &intel_ironlake_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_M_G, &intel_ironlake_info ),
@@ -181,7 +185,6 @@ static const struct pci_id_match intel_device_match[] = {
 	INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, &intel_sandybridge_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_S_GT, &intel_sandybridge_info ),
 
-
 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_M_GT1, &intel_ivybridge_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_M_GT2, &intel_ivybridge_info ),
 	INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT1, &intel_ivybridge_info ),
-- 
cgit v1.2.3