configure.ac | 2 +-
src/vesa.c | 49 +++++++++++++++++++++++++++++--------------------
src/vesa.h | 2 +-
3 files changed, 31 insertions(+), 22 deletions(-)
New commits:
commit 4ba7306fd0c9533750d389829e2cbf0522e149b3
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Wed Oct 19 01:49:38 2011 -0700
configure.ac: Require a newer version of libpciaccess
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/configure.ac b/configure.ac
index 2e4f542..5d39bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
CFLAGS="$save_CFLAGS"
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
commit efe1792818be463dd0367178f0233bc502b7a584
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Wed Oct 19 01:38:49 2011 -0700
Code style cleanup to make the map and unmap blocks more consistent
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/src/vesa.c b/src/vesa.c
index 5a0120c..23d9e14 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1260,27 +1260,28 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
pScrn->fbOffset = pVesa->mapOff;
#ifdef XSERVER_LIBPCIACCESS
- if ((pVesa->mapPhys != 0xa0000) && (pVesa->pciInfo != NULL)) {
- (void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase,
- pVesa->mapSize,
- (PCI_DEV_MAP_FLAG_WRITABLE
- | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
- & pVesa->base);
- }
- else
- (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
- pVesa->mapSize,
- PCI_DEV_MAP_FLAG_WRITABLE,
- & pVesa->base);
-
- if (pVesa->base) {
- if (pVesa->mapPhys != 0xa0000)
- (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
+ if (pVesa->pciInfo != NULL) {
+ if (pVesa->mapPhys != 0xa0000) {
+ (void) pci_device_map_range(pVesa->pciInfo, pScrn->memPhysBase,
+ pVesa->mapSize,
+ (PCI_DEV_MAP_FLAG_WRITABLE
+ | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+ & pVesa->base);
+
+ if (pVesa->base)
+ (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ & pVesa->VGAbase);
+ }
+ else {
+ (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
+ pVesa->mapSize,
PCI_DEV_MAP_FLAG_WRITABLE,
- & pVesa->VGAbase);
- else
- pVesa->VGAbase = pVesa->base;
+ & pVesa->base);
+ if (pVesa->base)
+ pVesa->VGAbase = pVesa->base;
+ }
}
#else
if (pVesa->mapPhys != 0xa0000 && pVesa->pEnt->location.type == BUS_PCI)
commit 1f84310ddf49778f776a39810aa98211c812e8ab
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Wed Oct 19 01:33:07 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/src/vesa.c b/src/vesa.c
index 1136ac3..5a0120c 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
& pVesa->base);
}
else
- pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
- pScrn->memPhysBase, pVesa->mapSize);
+ (void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
+ pVesa->mapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ & pVesa->base);
if (pVesa->base) {
if (pVesa->mapPhys != 0xa0000)
- pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
- pVesa->pciInfo,
- 0xa0000, 0x10000);
+ (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ & pVesa->VGAbase);
else
pVesa->VGAbase = pVesa->base;
@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
if (pVesa->mapPhys != 0xa0000) {
(void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
pVesa->mapSize);
- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
+ 0x10000);
}
else {
- xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
+ (void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
+ pVesa->mapSize);
}
#else
xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
commit 1a60e9068284e1ef22d8c470a85410a54ee668e8
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Wed Oct 19 01:15:13 2011 -0700
Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/src/vesa.h b/src/vesa.h
index 89245b9..bcc9e37 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -114,7 +114,7 @@ typedef struct _VESARec
xf86EnableDisableFBAccessProc *EnableDisableFBAccess;
Bool accessEnabled;
OptionInfoPtr Options;
- IOADDRESS ioBase;
+ unsigned long ioBase;
Bool ModeSetClearScreen;
void *shadow;
ShadowUpdateProc update;
commit 463886df688d3521afc47ec88f9aaf67e924ec7f
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Wed Oct 19 01:15:03 2011 -0700
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/src/vesa.c b/src/vesa.c
index 61d3550..1136ac3 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
}
#endif
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
pVesa->ioBase = pScrn->domainIOBase;
+#else
+ pVesa->ioBase = 0;
+#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
"virtual address = %p,\n"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rhec9-0006ea...@vasks.debian.org
