xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
src/i830_quirks.c | 14 +++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 5ee91ef9325673475d5f2b3de20277d046523a59
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 4 12:33:35 2008 +0200
changelog update
diff --git a/debian/changelog b/debian/changelog
index 5f28072..509feb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.3.2-2+lenny2) unstable; urgency=low
+
+ * Revert the quirk for all 855GM chipsets, as it regresses some users
+ (closes: #493096). Instead, fix up the quirk for the HP Pavilion ze4944ea
+ laptop so it actually works.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 04 Aug 2008 12:31:58 +0200
+
xserver-xorg-video-intel (2:2.3.2-2+lenny1) unstable; urgency=low
* Cherry-pick patches from the 2.4.0 release:
commit b509e95d2847873bd2aa0024162dcffabe53761a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 4 12:18:12 2008 +0200
Fix up the HP Pavilion ze4944ea quirk
The chip is 855GM, not GM45.
(cherry picked from commit 1a59cc6b9acf312de1755d67757bf7f1967342e4)
diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index a671655..297bc92 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -271,8 +271,6 @@ static i830_quirk i830_quirk_list[] = {
/* HP Compaq 6730s has no TV output */
{ PCI_CHIP_GM45_GM, 0x103c, 0x30e8, quirk_ignore_tv },
- /* HP Pavilion ze4944ea needs pipe A force quirk (See LP: #242389) */
- { PCI_CHIP_GM45_GM, 0x103c, 0x3084, quirk_pipea_force },
/* Thinkpad R31 needs pipe A force quirk */
{ PCI_CHIP_I830_M, 0x1014, 0x0505, quirk_pipea_force },
@@ -292,6 +290,8 @@ static i830_quirk i830_quirk_list[] = {
{ PCI_CHIP_I855_GM, 0x1028, 0x00c8, quirk_pipea_force },
/* Intel 855GM hardware (See Novell Bugzilla #406123) */
{ PCI_CHIP_I855_GM, 0x10cf, 0x1215, quirk_pipea_force },
+ /* HP Pavilion ze4944ea needs pipe A force quirk (See LP: #242389) */
+ { PCI_CHIP_I855_GM, 0x103c, 0x3084, quirk_pipea_force },
/* ThinkPad X40 needs pipe A force quirk */
{ PCI_CHIP_I855_GM, 0x1014, 0x0557, quirk_pipea_force },
commit 2c5a42c00dc99ad01405f91056db974e5ebc4c8b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 31 13:32:15 2008 +0200
Revert "Don't disable pipe A on 855 chips"
This reverts commit b25aefae388cdbf34d2ffa323853cd0661cd40ac.
It causes a regression (Debian bug #493096).
diff --git a/src/i830_quirks.c b/src/i830_quirks.c
index 5ae2898..a671655 100644
--- a/src/i830_quirks.c
+++ b/src/i830_quirks.c
@@ -313,9 +313,6 @@ static i830_quirk i830_quirk_list[] = {
/* Littlebit Sepia X35 (rebranded Asus Z37E) (See LP: #201257) */
{ PCI_CHIP_I965_GM, 0x1043, 0x8265, quirk_ignore_tv },
- /* 855 & before need to leave pipe A & dpll A up */
- { PCI_CHIP_I855_GM, SUBSYS_ANY, SUBSYS_ANY, quirk_pipea_force },
-
{ 0, 0, 0, NULL },
};
@@ -332,10 +329,9 @@ void i830_fixup_devices(ScrnInfoPtr scrn)
while (p && p->chipType != 0) {
if (DEVICE_ID(pI830->PciInfo) == p->chipType &&
- (SUBVENDOR_ID(pI830->PciInfo) == p->subsysVendor ||
- p->subsysVendor == SUBSYS_ANY) &&
- (SUBSYS_ID(pI830->PciInfo) == p->subsysCard ||
- p->subsysCard == SUBSYS_ANY))
+ SUBVENDOR_ID(pI830->PciInfo) == p->subsysVendor &&
+ (SUBSYS_ID(pI830->PciInfo) == p->subsysCard ||
+ p->subsysCard == SUBSYS_ANY))
p->hook(pI830);
++p;
}
Reply to: