diff options
| author | Tristan Plumb <freedesktop@trstn.net> | 2016-04-28 15:21:54 -0400 |
|---|---|---|
| committer | Connor Behan <connor.behan@gmail.com> | 2016-04-28 15:23:32 -0400 |
| commit | 923e6d6c6dbbf6a8d40cb8a39cb8760912f86366 (patch) | |
| tree | cf8ef5bc80751c30eedeb27a51916cf6b6b7fe6d | |
| parent | 754628ddefbf800d5b9122188070bf11aa71f126 (diff) | |
Add check for libpciaccess on ARM
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=30619
Reviewed-by: Connor Behan <connor.behan@gmail.com>
| -rw-r--r-- | src/xgi_driver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xgi_driver.c b/src/xgi_driver.c index 15bda22..79fe4fe 100644 --- a/src/xgi_driver.c +++ b/src/xgi_driver.c @@ -2612,8 +2612,12 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) if (pXGI->Primary) { #if defined(__arm__) +#ifdef XSERVER_LIBPCIACCESS + VGAHWPTR(pScrn)->MapPhys = pXGI->PciInfo->regions[2].base_addr + 0xf2000000; +#else VGAHWPTR(pScrn)->MapPhys = pXGI->PciInfo->ioBase[2] + 0xf2000000; #endif +#endif VGAHWPTR(pScrn)->MapSize = 0x10000; /* Standard 64k VGA window */ if (!vgaHWMapMem(pScrn)) { |