xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 1d0f1d31e2ed1d91ee87cb3e02ce48c8c07aa418
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon May 12 15:44:35 2008 +1000

    radeon: rs485 vs rs485m.. mobile? non-mobile? bi?
    
    So it appears we have in the wild two chipsets with the same PCI ID (0x1002:0x5974)
    that are mobile and non-mobile.
    
    the RH bug references is a desktop system.
    The Dell Vostro 1100 also has this chipset with LVDS bits.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 2701f57..2acc1e9 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1624,6 +1624,13 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DELL server detected, force to special setup\n");
 	}
 	break;
+    case PCI_CHIP_RS482_5974:
+	/* RH BZ 444586 - non mobility version
+ 	 * Dell appear to have the Vostro 1100 with a mobility part with the same pci-id */
+	if ((PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1462) &&
+            (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x7141)) {
+		info->IsMobility = FALSE;
+	}
     default:
 	break;
     }