diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/ChangeLog xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/ChangeLog --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/ChangeLog 2012-06-06 14:15:46.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/ChangeLog 2012-07-16 14:39:09.000000000 +0000 @@ -1,9 +1,17 @@ -commit e6d28a0344827f55eb7783263d1019b55a2fa8bb +commit f4c4cfd640b9b1857ca5de446051c634b1aee788 Author: Robert Hooker -Date: Wed Jun 6 10:15:37 2012 -0400 +Date: Mon Jul 16 10:39:00 2012 -0400 Add debian tree from origin/debian-unstable +commit c829ff70025e927bdec58e270e80c7097537a567 +Author: Dave Airlie +Date: Mon Jul 16 18:23:39 2012 +1000 + + i128: build against xaa-less server. + + Signed-off-by: Dave Airlie + commit 659390ecdb36bb5e65b41a867257f3b9583e45de Author: Dave Airlie Date: Wed Jun 6 12:44:53 2012 +0100 diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/config.h.in xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/config.h.in --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/config.h.in 2012-06-06 14:15:45.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/config.h.in 2012-07-16 14:39:08.000000000 +0000 @@ -35,6 +35,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_XAA_H + /* Have 1bpp support */ #undef HAVE_XF1BPP diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/configure xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/configure --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/configure 2012-06-06 14:15:45.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/configure 2012-07-16 14:39:08.000000000 +0000 @@ -619,6 +619,8 @@ LIBOBJS DRIVER_NAME moduledir +XAA_FALSE +XAA_TRUE XSERVER_LIBPCIACCESS_FALSE XSERVER_LIBPCIACCESS_TRUE PCIACCESS_LIBS @@ -778,6 +780,7 @@ with_sysroot enable_libtool_lock with_xorg_module_dir +enable_xaa ' ac_precious_vars='build_alias host_alias @@ -1432,6 +1435,8 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-xaa Enable legacy X Acceleration Architecture (XAA) + [default=auto] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -18127,6 +18132,49 @@ fi + +# Check whether --enable-xaa was given. +if test "${enable_xaa+set}" = set; then : + enableval=$enable_xaa; XAA="$enableval" +else + XAA=auto +fi + +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + for ac_header in xaa.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "xaa.h" "ac_cv_header_xaa_h" "$ac_includes_default" +if test "x$ac_cv_header_xaa_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_XAA_H 1 +_ACEOF + XAA=yes +else + XAA=no +fi + +done + + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include XAA support" >&5 +$as_echo_n "checking whether to include XAA support... " >&6; } + if test "x$XAA" = xyes; then + XAA_TRUE= + XAA_FALSE='#' +else + XAA_TRUE='#' + XAA_FALSE= +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAA" >&5 +$as_echo "$XAA" >&6; } + # Required by exa.h $as_echo "#define EXA_DRIVER_KNOWN_MAJOR 3" >>confdefs.h @@ -18273,6 +18321,10 @@ as_fn_error $? "conditional \"XSERVER_LIBPCIACCESS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${XAA_TRUE}" && test -z "${XAA_FALSE}"; then + as_fn_error $? "conditional \"XAA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/configure.ac xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/configure.ac --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/configure.ac 2012-05-04 22:20:10.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/configure.ac 2012-07-16 14:39:00.000000000 +0000 @@ -78,6 +78,25 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) + # Required by exa.h AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle]) diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/debian/changelog xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/debian/changelog --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/debian/changelog 2012-07-16 14:49:56.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/debian/changelog 2012-07-16 14:49:56.000000000 +0000 @@ -1,10 +1,10 @@ -xserver-xorg-video-i128 (1:1.3.5+git20120606.659390ec-0ubuntu0sarvatt~precise) precise; urgency=low +xserver-xorg-video-i128 (1:1.3.5+git20120716.c829ff70-0ubuntu0sarvatt~precise) precise; urgency=low - * Checkout from git 20120606 (master branch) up to commit - 659390ecdb36bb5e65b41a867257f3b9583e45de + * Checkout from git 20120716 (master branch) up to commit + c829ff70025e927bdec58e270e80c7097537a567 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 06 Jun 2012 10:15:47 -0400 + -- Robert Hooker Mon, 16 Jul 2012 10:39:10 -0400 xserver-xorg-video-i128 (1:1.3.5-1) unstable; urgency=low diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/.lastcommit xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/.lastcommit --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/.lastcommit 2012-06-06 14:15:37.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/.lastcommit 2012-07-16 14:39:00.000000000 +0000 @@ -1 +1 @@ -commit 659390ecdb36bb5e65b41a867257f3b9583e45de +commit c829ff70025e927bdec58e270e80c7097537a567 diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128accel.c xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128accel.c --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128accel.c 2012-06-06 14:15:37.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128accel.c 2012-07-16 14:39:00.000000000 +0000 @@ -26,8 +26,7 @@ #include "config.h" #endif -#include "xaa.h" -#include "xaalocal.h" + #include "xf86fbman.h" #include "miline.h" #include "servermd.h" @@ -40,6 +39,9 @@ #include "i128.h" #include "i128reg.h" +#ifdef HAVE_XAA_H +#include "xaalocal.h" + static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h); static void I128SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, @@ -62,6 +64,7 @@ unsigned planemask); #endif +#endif #define ENG_PIPELINE_READY() { while (pI128->mem.rbase_a[BUSY] & BUSY_BUSY) ; } #define ENG_DONE() { while (pI128->mem.rbase_a[FLOW] & (FLOW_DEB | FLOW_MCB | FLOW_PRV)) ;} @@ -100,7 +103,7 @@ ENG_DONE(); } - +#ifdef HAVE_XAA_H static void I128BitBlit(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2, int w, int h) { @@ -412,9 +415,12 @@ } #endif +#endif + Bool I128XaaInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); I128Ptr pI128 = I128PTR(pScrn); @@ -519,4 +525,7 @@ } return(XAAInit(pScreen, infoPtr)); +#else + return FALSE; +#endif } diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128dga.c xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128dga.c --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128dga.c 2012-06-06 14:15:37.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128dga.c 2012-07-16 14:39:00.000000000 +0000 @@ -7,8 +7,6 @@ #include "xf86_OSproc.h" #include "xf86Pci.h" #include "xf86PciInfo.h" -#include "xaa.h" -#include "xaalocal.h" #include "i128.h" #include "dgaproc.h" @@ -18,12 +16,14 @@ static Bool I128_SetMode(ScrnInfoPtr, DGAModePtr); static int I128_GetViewport(ScrnInfoPtr); static void I128_SetViewport(ScrnInfoPtr, int, int, int); +#ifdef HAVE_XAA_H static void I128_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); static void I128_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); #if 0 static void I128_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int, unsigned long); #endif +#endif static DGAFunctionRec I128_DGAFuncs = { @@ -33,6 +33,7 @@ I128_SetViewport, I128_GetViewport, I128EngineDone, +#ifdef HAVE_XAA_H I128_FillRect, I128_BlitRect, #if 0 @@ -40,6 +41,9 @@ #else NULL #endif +#else + NULL, NULL, NULL +#endif }; @@ -194,6 +198,7 @@ pI128->DGAViewportStatus = 0; /* I128AdjustFrame loops until finished */ } +#ifdef HAVE_XAA_H static void I128_FillRect ( ScrnInfoPtr pScrn, @@ -253,7 +258,7 @@ } } #endif - +#endif static Bool I128_OpenFramebuffer( ScrnInfoPtr pScrn, diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128_driver.c xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128_driver.c --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128_driver.c 2012-06-06 14:15:37.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128_driver.c 2012-07-16 14:39:00.000000000 +0000 @@ -57,7 +57,6 @@ #include "xf86DDC.h" #include "vbe.h" -#include "xaa.h" #include "xf86cmap.h" #include "fb.h" @@ -1704,8 +1703,10 @@ I128Restore(pScrn); I128UnmapMem(pScrn); } +#ifdef HAVE_XAA_H if (pI128->XaaInfoRec) XAADestroyInfoRec(pI128->XaaInfoRec); +#endif if (pI128->ExaDriver) { exaDriverFini(pScreen); free(pI128->ExaDriver); diff -Nru xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128.h xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128.h --- xserver-xorg-video-i128-1.3.5+git20120606.659390ec/src/i128.h 2012-06-06 14:15:37.000000000 +0000 +++ xserver-xorg-video-i128-1.3.5+git20120716.c829ff70/src/i128.h 2012-07-16 14:39:00.000000000 +0000 @@ -14,7 +14,9 @@ #include "i128pcirename.h" #include "compiler.h" +#ifdef HAVE_XAA_H #include "xaa.h" +#endif #include "exa.h" #include "xf86Cursor.h" #include "vgaHW.h" @@ -115,7 +117,9 @@ int minClock; CloseScreenProcPtr CloseScreen; +#ifdef HAVE_XAA_H XAAInfoRecPtr XaaInfoRec; +#endif ExaDriverPtr ExaDriver; xf86CursorInfoPtr CursorInfoRec; I2CBusPtr I2C;