Don't disable pipe A on 855 chips

It needs to stay enabled or we may see hangs when trying to re-enable it (say
at VT switch time).

Fixes FDO bug #15168.
This commit is contained in:
Jesse Barnes 2008-07-17 12:30:57 -07:00 committed by Jesse Barnes
parent c4565a9811
commit b37a2a8ca8
1 changed files with 7 additions and 3 deletions

View File

@ -309,6 +309,9 @@ 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 },
};
@ -325,9 +328,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;
}