summaryrefslogtreecommitdiff
path: root/hw/xfree86/vgahw
diff options
context:
space:
mode:
authorIan Romanick <idr@localhost.localdomain>2006-06-07 14:09:02 -0700
committerIan Romanick <idr@localhost.localdomain>2006-06-07 14:09:02 -0700
commit46f55f5dead5d70cdff30531d80a72f6be042315 (patch)
tree8b06abaed2a9c3908299620dd3595393a1d2766d /hw/xfree86/vgahw
parentd00aa6b8559d3e5f70c6558ce0abd12f7d758491 (diff)
Initial batch of changes for PCI rework. All future changes will be
tracked individually.
Diffstat (limited to 'hw/xfree86/vgahw')
-rw-r--r--hw/xfree86/vgahw/vgaHW.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index 6df7dee18..ec62d637f 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -31,6 +31,8 @@
#include "xf86cmap.h"
+#include "Pci.h"
+
#ifndef SAVE_FONT1
#define SAVE_FONT1 1
#endif
@@ -1637,7 +1639,7 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
{
vgaRegPtr regp;
vgaHWPtr hwp;
- pciVideoPtr pvp;
+ struct pci_device * pvp;
int i;
/*
@@ -1724,7 +1726,8 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
hwp->PIOOffset = scrp->domainIOBase;
if ((pvp = xf86GetPciInfoForEntity(scrp->entityList[0])))
- hwp->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
+ hwp->Tag = pciTag( PCI_MAKE_BUS( pvp->domain, pvp->bus ),
+ pvp->dev, pvp->func );
return TRUE;
}