summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCooper Yuan <cooperyuan@gmail.com>2010-02-26 16:14:12 +0800
committerCooper Yuan <cooperyuan@gmail.com>2010-02-26 16:14:12 +0800
commit3970cc5563900f08ba5236b23f765c926616c345 (patch)
tree67e0a869214b9a492032b5fee76c7e89bc52f243
parentb499eee7506f7478649e0000e9f8fcd00ac9d88d (diff)
add more triple-head server ID
-rw-r--r--src/radeon_driver.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e11c5e96..fc01797b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1876,19 +1876,24 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
case PCI_CHIP_RV100_QY:
case PCI_CHIP_RV100_QZ:
/* DELL triple-head configuration. */
- if ((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_DELL) &&
- ((PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016c) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016d) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016e) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016f) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0170) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017d) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017e) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0183) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x018a) ||
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x019a))) {
+ if (((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_DELL) &&
+ ((PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016c) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016d) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016e) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x016f) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0170) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017d) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x017e) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0183) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x018a) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x019a) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01b1) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01b2) ||
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0205))) ||
+ ((PCI_SUB_VENDOR_ID(info->PciInfo) == PCI_VENDOR_HP) &&
+ (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x31fb))) {
info->IsDellServer = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DELL server detected, force to special setup\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DELL/HP server detected, force to special setup\n");
}
break;
case PCI_CHIP_RS482_5974: