diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2012-06-21 09:52:46 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2012-06-21 09:52:46 +0000 |
| commit | 01aedbf572f4bd223c73fc016c9dcc35b7004dc0 (patch) | |
| tree | 03448a1d398c89b743cca8b21f40849d2deaa557 | |
| parent | ecda45f1c366e2425fde562b041c7a04443e6b10 (diff) | |
Since the transition to Xserver 1.12, the standard vgaHW layer
that depends on libpciaccess and is broken on macppc, so use
vgaHWSetMmioFuncs() instead of vgaHWSetStdFuncs() and unbreak
the nv driver on this platfrom.
ok matthieu@
| -rw-r--r-- | driver/xf86-video-nv/src/nv_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/driver/xf86-video-nv/src/nv_driver.c b/driver/xf86-video-nv/src/nv_driver.c index c484f5cd1..46ce9d28f 100644 --- a/driver/xf86-video-nv/src/nv_driver.c +++ b/driver/xf86-video-nv/src/nv_driver.c @@ -1785,7 +1785,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) } xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pNv->IOAddress); - + +#if defined(__powerpc__) + vgaHWSetMmioFuncs(VGAHWPTR(pScrn), (CARD8 *)pNv->IOAddress, 0); +#endif + #ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |