OpenBSD support for libpciaccess.

xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once.  I implemented pci_system_init_dev_mem() like Ian
suggested.  This requires some minor changes to the BSD-specific
os-support code.  Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
This commit is contained in:
Mark Kettenis 2008-03-12 21:45:37 +01:00 committed by Matthieu Herrb
parent 2036851125
commit 06c0372c3a
3 changed files with 6 additions and 1 deletions

View File

@ -212,6 +212,9 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->mapMem = mapVidMem;
pVidMem->unmapMem = unmapVidMem;
if (useDevMem)
pci_system_init_dev_mem(devMemFd);
#ifdef HAS_MTRR_SUPPORT
if (useDevMem) {
if (cleanMTRR()) {

View File

@ -81,4 +81,6 @@ bsdPciInit(void)
{
pciNumBuses = 1;
pciBusInfo[0] = &bsd_pci;
xf86InitVidMem();
}

View File

@ -37,7 +37,7 @@ ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
ioport_LDADD = \
../../os-support/libxorgos.la \
../../dummylib/libdummy-nonserver.a \
${UTILS_SYS_LIBS}
${UTILS_SYS_LIBS} ${PCIACCESS_LIBS}
ioport_SOURCES = \