configure.ac | 2 +- src/i128.h | 2 +- src/i128_driver.c | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit 8909e47f36cbb030060d5a40d673a962f997c93a Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:27 2009 +1000 i128: bump for release 1.3.3 diff --git a/configure.ac b/configure.ac index a671665..4648fc8 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i128], - 1.3.2, + 1.3.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i128) commit 6a5098d0f2439a2f2e338ab30fccc19032fae82a Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 i128: change to using ABI version check diff --git a/src/i128_driver.c b/src/i128_driver.c index a9c83d4..903a3a8 100644 --- a/src/i128_driver.c +++ b/src/i128_driver.c @@ -31,7 +31,7 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif commit ec37c2ec027ebcaa3bf138c32e417821b78527b0 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:30 2009 +1000 i128: update for resources/RAC API removal diff --git a/src/i128.h b/src/i128.h index db647da..f652e7c 100644 --- a/src/i128.h +++ b/src/i128.h @@ -38,8 +38,8 @@ typedef struct { pciVideoPtr PciInfo; #ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; -#endif xf86AccessRec Access; +#endif int Chipset; int ChipRev; Bool Primary; diff --git a/src/i128_driver.c b/src/i128_driver.c index 9de7527..a9c83d4 100644 --- a/src/i128_driver.c +++ b/src/i128_driver.c @@ -31,7 +31,10 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" @@ -52,7 +55,6 @@ #include "micmap.h" #include "xf86DDC.h" -#include "xf86RAC.h" #include "vbe.h" #include "xaa.h" @@ -723,12 +725,14 @@ I128PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MMIO registers at 0x%lX\n", (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO)); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pI128->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); I128FreeRec(pScrn); return FALSE; } +#endif /* HW bpp matches reported bpp */ pI128->bitsPerPixel = pScrn->bitsPerPixel; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
