diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:06:05 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:06:05 -0500 |
| commit | ca19356b3b979b92535f6f22f79c8bab852093a4 (patch) | |
| tree | b32fd0f8b12ecbbc0b222a286ce8011c39c6d20d /src/apm_driver.c | |
| parent | 413eee03287b6e161ce0337df712099b585aa722 (diff) | |
| parent | 967f6f20670baa33506c3c1b107260a4f909f3d6 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-apm
Diffstat (limited to 'src/apm_driver.c')
| -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 8ee708f..4e548a4 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 GET_ABI_MAJOR(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; |