From 8675aa788ba555aeb41c64080ca3a642ddb4b087 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 21 Apr 2010 11:06:06 +1000 Subject: intel-2.2.1-add-845G+855GM-quirk-pipea-force.patch --- src/i830_quirks.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/i830_quirks.c b/src/i830_quirks.c index 1c79d132..d2c2a442 100644 --- a/src/i830_quirks.c +++ b/src/i830_quirks.c @@ -253,6 +253,10 @@ static i830_quirk i830_quirk_list[] = { /* Sony vaio PCG-r600HFP (fix bug 13722) */ { PCI_CHIP_I830_M, 0x104d, 0x8100, quirk_ivch_dvob }, + /* 855 & before need to leave pipe A & dpll A up */ + { PCI_CHIP_I855_GM, SUBSYS_ANY, SUBSYS_ANY, quirk_pipea_force }, + { PCI_CHIP_845_G, SUBSYS_ANY, SUBSYS_ANY, quirk_pipea_force }, + { 0, 0, 0, NULL }, }; @@ -286,9 +290,10 @@ void i830_fixup_devices(ScrnInfoPtr scrn) while (p && p->chipType != 0) { if (DEVICE_ID(pI830->PciInfo) == p->chipType && - SUBVENDOR_ID(pI830->PciInfo) == p->subsysVendor && - (SUBSYS_ID(pI830->PciInfo) == p->subsysCard || - p->subsysCard == SUBSYS_ANY)) + (SUBVENDOR_ID(pI830->PciInfo) == p->subsysVendor || + p->subsysVendor == SUBSYS_ANY) && + (SUBSYS_ID(pI830->PciInfo) == p->subsysCard || + p->subsysCard == SUBSYS_ANY)) p->hook(pI830); ++p; } -- cgit v1.2.3