xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_dri.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 90ce00a3dbf37833a71db234372695460c8f0342
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Jan 4 19:13:53 2009 -0500

    AGP: Print both device and subsytem pci ids for agp
    
    helpful for adding quirks with libpciaccess

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index f3c510b..596c1c0 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -866,10 +866,12 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen)
     } /* Don't mention this otherwise, so that people don't get funny ideas */
 
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	       "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n",
+	       "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x 0x%04x/0x%04x]\n",
 	       mode, vendor, device,
 	       PCI_DEV_VENDOR_ID(info->PciInfo),
-	       PCI_DEV_DEVICE_ID(info->PciInfo));
+	       PCI_DEV_DEVICE_ID(info->PciInfo),
+	       PCI_SUB_VENDOR_ID(info->PciInfo),
+	       PCI_SUB_DEVICE_ID(info->PciInfo));
 
     if (drmAgpEnable(info->dri->drmFD, mode) < 0) {
 	xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] AGP not enabled\n");