diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-03-28 08:08:04 -0700 |
| commit | 2c6d47108880584f1221ff86c6c8947627f9f607 (patch) | |
| tree | 64a042f58df056433c430fb0c99735d9e8c0904d /hw/xfree86/os-support/bus/axpPci.c | |
| parent | c4fe1bcce1c1e4822e688959b331b47a051d6e0a (diff) | |
| parent | 85220446359a75ea2c359b418b4051c04eea739c (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
Diffstat (limited to 'hw/xfree86/os-support/bus/axpPci.c')
| -rw-r--r-- | hw/xfree86/os-support/bus/axpPci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 1f1547798..e2f086c53 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -217,7 +217,8 @@ axpPciInit() * only set up the root bus for each domain (hose) and the bridged * buses will be set up as they are found. */ - bus = PCI_MAKE_BUS(domain, 0); + /* make a bus with both the domain and the root bus in it */ + bus = PCI_MAKE_BUS(domain, pDomain->root_bus); pciBusInfo[bus] = xnfalloc(sizeof(pciBusInfo_t)); (void)memset(pciBusInfo[bus], 0, sizeof(pciBusInfo_t)); @@ -246,7 +247,7 @@ axpPciBusFromTag(PCITAG tag) || !(pDomain = pBusInfo->pciBusPriv) || (pDomain->domain != PCI_DOM_FROM_TAG(tag))) return -1; - bus = PCI_BUS_NO_DOMAIN(bus) + pDomain->root_bus; + bus = PCI_BUS_NO_DOMAIN(bus); /* should just be root_bus */ dfn = PCI_DFN_FROM_TAG(tag); if (_iobase(IOBASE_HOSE, -1, bus, dfn) != pDomain->hose) return -1; |