diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-22 12:38:14 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-22 12:38:14 -0700 |
| commit | ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44 (patch) | |
| tree | aef6fd28a77e250c740225ff496f006fb29d0984 /src/savage_dri.c | |
| parent | 68ceead721aeb75b9faed6297407a320a83499e4 (diff) | |
Merge PCI-rework support and "classic" PCI interface support into one treepci-rework
First pass at merging both trees. So far, this has only been compile
tested. I need to dig out a savage card to put in a system for
testing, so it may take another hour or two.
Diffstat (limited to 'src/savage_dri.c')
| -rw-r--r-- | src/savage_dri.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c index 41e8bb1..aca0b8c 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -467,8 +467,8 @@ static Bool SAVAGEDRIAgpInit(ScreenPtr pScreen) xf86DrvMsg( pScreen->myNum, X_INFO, "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n", mode, vendor, device, - psav->PciInfo->vendor_id, - psav->PciInfo->device_id ); + VENDOR_ID(psav->PciInfo), + DEVICE_ID(psav->PciInfo)); if ( drmAgpEnable( psav->drmFD, mode ) < 0 ) { xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] AGP not enabled\n" ); @@ -882,7 +882,11 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen ) sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d", psav->PciInfo->bus, +#ifdef PCIACCESS psav->PciInfo->dev, +#else + psav->PciInfo->device, +#endif psav->PciInfo->func); } pDRIInfo->ddxDriverMajorVersion = SAVAGE_VERSION_MAJOR; |