xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 5 +
debian/patches/100_b43_pciid_update.patch | 81 ++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 87 insertions(+)
New commits:
commit 6611bcdc3ccbca2a482672a0b284ab032dcad7ed
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sun Sep 26 22:03:22 2010 -0400
Update b43 pci id's.
diff --git a/debian/changelog b/debian/changelog
index 7a8ff4e..56d4a66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ xserver-xorg-video-intel (2:2.12.0-1ubuntu5) maverick; urgency=low
until the Q42010 Intel releases, which will not be pulled into maverick.
Without this change, all 3D apps on these devices cause hangs.
(LP: #639667)
+ * Add 102_b43_pciid_update.patch. Fixes detection of a new b43
+ chipset revision that is being shipped. Without this the drivers
+ will not attempt to load even though this chipset is the same as
+ the previous b43 ones. Backport of upstream commit 55b5fe8880.
+ (LP: #640214)
[ Christopher James Halse Rogers ]
* debian/patches/101_copy-fb.patch: Move scratch pixmap creation to the
diff --git a/debian/patches/100_b43_pciid_update.patch b/debian/patches/100_b43_pciid_update.patch
new file mode 100644
index 0000000..7c3d2ce
--- /dev/null
+++ b/debian/patches/100_b43_pciid_update.patch
@@ -0,0 +1,81 @@
+diff --git a/src/common.h b/src/common.h
+index 30f1c78..d7e7e4b 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -313,6 +313,11 @@ extern int I810_DEBUG;
+ #define PCI_CHIP_B43_G_BRIDGE 0x2E40
+ #endif
+
++#ifndef PCI_CHIP_B43_G1
++#define PCI_CHIP_B43_G1 0x2E92
++#define PCI_CHIP_B43_G1_BRIDGE 0x2E90
++#endif
++
+ #ifndef PCI_CHIP_IGDNG_D_G
+ #define PCI_CHIP_IGDNG_D_G 0x0042
+ #define PCI_CHIP_IGDNG_D_G_BRIDGE 0x0040
+@@ -356,7 +361,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 || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_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 || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G1 || 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 088b552..f5cf9a9 100644
+--- a/src/i810_driver.c
++++ b/src/i810_driver.c
+@@ -138,6 +138,7 @@ static const struct pci_id_match intel_device_match[] = {
+ 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_B43_G1, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE, 0 ),
+@@ -194,6 +195,7 @@ static SymTabRec I810Chipsets[] = {
+ {PCI_CHIP_Q45_G, "Q45/Q43"},
+ {PCI_CHIP_G41_G, "G41"},
+ {PCI_CHIP_B43_G, "B43"},
++ {PCI_CHIP_B43_G1, "B43"},
+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
+ {PCI_CHIP_IGDNG_M_G, "Arrandale"},
+ {-1, NULL}
+@@ -233,6 +235,7 @@ static PciChipsets I810PciChipsets[] = {
+ {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_B43_G1, PCI_CHIP_B43_G1, 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 b8e0c0b..4249c80 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -114,6 +114,7 @@ static SymTabRec I830Chipsets[] = {
+ {PCI_CHIP_Q45_G, "Q45/Q43"},
+ {PCI_CHIP_G41_G, "G41"},
+ {PCI_CHIP_B43_G, "B43"},
++ {PCI_CHIP_B43_G1, "B43"},
+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"},
+ {PCI_CHIP_IGDNG_M_G, "Arrandale"},
+ {-1, NULL}
+@@ -147,6 +148,7 @@ static PciChipsets I830PciChipsets[] = {
+ {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_B43_G1, PCI_CHIP_B43_G1, 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}
+@@ -491,6 +493,7 @@ static void i830_detect_chipset(ScrnInfoPtr scrn)
+ chipname = "G41";
+ break;
+ case PCI_CHIP_B43_G:
++ case PCI_CHIP_B43_G1:
+ chipname = "B43";
+ break;
+ case PCI_CHIP_IGDNG_D_G:
diff --git a/debian/patches/series b/debian/patches/series
index 994395c..478c050 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+100_b43_pciid_update.patch
101_copy-fb.patch
102-disable-page-flipping-v2.patch
103-mbp-backlight-support.patch
Reply to: