diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-11-16 13:02:14 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-11-16 13:02:34 -0500 |
| commit | 6b195cc0273650d01fc20c26433b929e9683aa5f (patch) | |
| tree | e1df8eea8dbcd47432dca25658e88430dea62900 | |
| parent | 9ce6499f013a5b6fdc9440fd3213dbb28b3bf1be (diff) | |
Adapt to vgahw changes in videoabi 12
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/apm_driver.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/apm_driver.c b/src/apm_driver.c index f172bab..f77bb2b 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) hwp = VGAHWPTR(pScrn); vgaHWGetIOBase(hwp); - pApm->iobase = hwp->PIOOffset; - pApm->xport = hwp->PIOOffset + 0x3C4; +#if ABI_VIDEODRV_VERSION < 12 +#define PIOOFFSET hwp->PIOOffset +#else +/* FIXME reintroduce domain support */ +#define PIOOFFSET 0 +#endif + pApm->iobase = PIOOFFSET; + pApm->xport = PIOOFFSET + 0x3C4; /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; |