diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-09 15:27:34 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-09 15:27:34 -0800 |
| commit | da09964a931cc64d05ab571bf545fdad35a6d395 (patch) | |
| tree | 74df8983ff0ab97a7881b8d4c0fdc3df74aa4cb3 /hw/xfree86/os-support/linux/int10/linux.c | |
| parent | e1f73d220873fa091695e46b7fcd008663a95a6f (diff) | |
| parent | e3aa6ad201eb20862c11c000e76206e317a96dc9 (diff) | |
Merge branch 'origin' into pci-rework
Conflicts:
hw/xfree86/int10/generic.c
Diffstat (limited to 'hw/xfree86/os-support/linux/int10/linux.c')
| -rw-r--r-- | hw/xfree86/os-support/linux/int10/linux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 3bab5e7b0..1940d9160 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -90,6 +90,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) legacyVGARec vga; xf86int10BiosLocation bios; Bool videoBiosMapped = FALSE; + pciVideoPtr pvp; if (int10Generation != serverGeneration) { counter = 0; @@ -151,6 +152,8 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec)); pInt->scrnIndex = screen; pInt->entityIndex = entityIndex; + pvp = xf86GetPciInfoForEntity(entityIndex); + if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func); if (!xf86Int10ExecSetup(pInt)) goto error0; pInt->mem = &linuxMem; |