diff options
| author | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:06 +1000 |
| commit | 8675aa788ba555aeb41c64080ca3a642ddb4b087 (patch) | |
| tree | 08b56b298f691446b2ad55d96814ab81ec2895c2 | |
| parent | e51b9e297c1f6a27f1f87466899a8b56592c4703 (diff) | |
intel-2.2.1-add-845G+855GM-quirk-pipea-force.patch
| -rw-r--r-- | src/i830_quirks.c | 11 |
1 files 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; } |