.gitignore | 84 +++-- ChangeLog | 284 +++++++++++++++++ Makefile.am | 15 README | 830 ++++++++++++++++++++++++++++++++++++++++++++++++++- README.ati | 828 -------------------------------------------------- README.ati.sgml | 648 --------------------------------------- configure.ac | 60 +-- debian/changelog | 20 + debian/control | 2 man/Makefile.am | 64 +-- src/aticonfig.c | 2 src/aticonsole.c | 27 - src/atidga.c | 2 src/atidri.c | 54 +-- src/atii2c.c | 8 src/atimach64exa.c | 2 src/atimach64i2c.c | 2 src/atimach64probe.c | 4 src/atimach64xv.c | 11 src/atimode.c | 2 src/atipreinit.c | 2 src/atiscreen.c | 22 - 22 files changed, 1317 insertions(+), 1656 deletions(-)
New commits: commit b9b4c41f73c3d51813fb3c22224ae44db9be61d8 Author: Julien Cristau <[email protected]> Date: Thu Apr 28 17:44:42 2011 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 24ac0cb..7f41332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,287 @@ +commit ef55d1f123972ccc001bf8b41db45d281be35a62 +Author: Julien Cristau <[email protected]> +Date: Thu Apr 28 17:23:42 2011 +0200 + + Bump to 6.9.0 + + Signed-off-by: Julien Cristau <[email protected]> + +commit 39c6d1da8af563afa665d5bb149c9693e24c6eab +Author: Julien Cristau <[email protected]> +Date: Thu Apr 28 17:31:52 2011 +0200 + + Replace deprecated xalloc/xfree/xrealloc with malloc/free/realloc + + Signed-off-by: Julien Cristau <[email protected]> + +commit d60087f0b6dd4d082230312580ae35e14acd0c6e +Author: Dave Airlie <[email protected]> +Date: Thu Dec 2 19:11:05 2010 +1000 + + mach64: fix the pixmap private API change. + +commit e7bc106247d9ba10a922936e137a4f5ecc54ef9e +Author: Alan Coopersmith <[email protected]> +Date: Sat Oct 30 09:37:17 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1732886624c7590a8084bb7d92e87ff341aa6d66 +Author: Mark Kettenis <[email protected]> +Date: Sun Aug 29 18:07:01 2010 +0200 + + Don't play wrapping games + + The driver calls the wrapped CloseScreen function in the middle of messing + with the hardware state. On multi-card setups this may cause the VGA + arbiter to switch to a different card while we're in the middle of things, + with obvious disastrous effects. This fixes things by making sure we + only call the wrapped CloseScreen function at the very end of the driver's + CloseScreen function. + + Signed-off-by: Mark Kettenis <[email protected]> + +commit 7a1549678a19c6e94e1ecb3223c74effbd5009d2 +Author: Mark Kettenis <[email protected]> +Date: Sun Aug 29 17:54:19 2010 +0200 + + Don't attempt to stop video on Mach64's without hardware overlay support + + Older Mach64 variants don't have hardware overlay support. This is handled + properly when the XVideo adapter is initialized (we bail out early), but + ATICloseXVideo() unconditionally tries to stop video during screen termination. + This causes the server to hang on certain multi-card setups. Fix the issue + by checking Block1Base before proceeding with stopping video. + + Signed-off-by: Mark Kettenis <[email protected]> + +commit 88a176df8df09812719eb179b293ce4dc851f2e5 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 16:49:04 2010 -0400 + + config: add comments for main statements + +commit 18ee3aa1b7a4c9de9cc705cb10e05864d3ab6406 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 16:07:00 2010 -0400 + + config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit d061e00d4d09e8fbecc8bad95354551d36197dd4 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:37:41 2010 -0400 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 69da993c9bdb8982c650533ca44a34fa2d7589fa +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 14:05:22 2010 -0400 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 37f35b579e9ea1a4b5b50f3ae570e3329664c38e +Author: Gaetan Nadon <[email protected]> +Date: Wed Jul 21 09:27:42 2010 -0400 + + config: complete AC_INIT m4 quoting + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1cb6b6939e5d466797721a2e59afdd067e769fcc +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 21:54:11 2010 -0400 + + config: remove unrequired AC_SUBST([DRI_CFLAGS]) + + This macro is called by PKG_CHECK_MODULES + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 590d1989f22c38d8db01146b2207d440bc59f285 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 21:44:57 2010 -0400 + + config: remove unrequired AC_SUBST([XORG_CFLAGS]) + + This macro is called by PKG_CHECK_MODULES + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7bf12fb07625bd5503c5de3e5e07bd69c6de54b3 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 20:24:42 2010 -0400 + + config: remove unrequired AC_HEADER_STDC + + Autoconf says: + "This macro is obsolescent, as current systems have conforming + header files. New programs need not use this macro". + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 3518273c2117c0d8e51efecb2f9184d5f8274ae0 +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 19:41:31 2010 -0400 + + config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 + + XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls + AC_PROG_C_C99. This sets gcc with -std=gnu99. + If AC_PROG_CC macro is called afterwards, it resets CC to gcc. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 03dd23597e64f440e5530bd8bfbd222b8f825d5a +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 18:45:19 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit d5b5e2bb4139b723df35a422b945d514caf4db2d +Author: Gaetan Nadon <[email protected]> +Date: Tue Jul 20 16:15:29 2010 -0400 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + +commit 6da9520fe6c482c1d4cb9dd6119c13789ed9715a +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 21 10:37:11 2010 -0400 + + config: remove optional check for xf86miscproto + + This extension is obsolete and is not used by this driver. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1f1e665f7dab55eceb314adb185636b8ee64fbc6 +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 14 08:43:04 2010 -0400 + + README: keep the text version of README, discard the sgml version + + The linuxdoc doc tool is deprecated. + README files are exclusively text files. + Normalize to one plain text README file. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 2863c5617ccb4a09a699c43c72d9b496480db102 +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 14 08:38:59 2010 -0400 + + README: fix linuxdoc content + + defs.ent are located under X11 directory + ident tag is not a Linuxdoc tag + replace docbook email tag with linuxdoc email tag + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ebfb29a00384ae8070d9f10726c591c0ca92637c +Author: Matt Turner <[email protected]> +Date: Mon Mar 8 10:52:54 2010 -0500 + + Don't check for Xinerama. + + It doesn't seem to be used anywhere, so don't require it. + + CC: Jerome Glisse <[email protected]> + CC: Alex Deucher <[email protected]> + CC: Dave Airlie <[email protected]> + Signed-off-by: Matt Turner <[email protected]> + +commit 383903574b9660f9d7831b149f2a9b339a871586 +Author: Alan Coopersmith <[email protected]> +Date: Fri Jan 15 15:54:36 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0059e1e49b1e6861aad801b93ccf846a236a42a7 +Author: Gaetan Nadon <[email protected]> +Date: Tue Dec 15 21:47:06 2009 -0500 + + configure.ac: use backticks rather than $() for cmd subs + + Use "$PKG_CONFIG" rather than hard coded "pkg-config" + + Acked-by: Dan Nicholson <[email protected]> + Acked-by: Daniel Stone <[email protected]> + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 8f84a92309e62655de69c09affa2e6922cc46aa1 +Author: Gaetan Nadon <[email protected]> +Date: Mon Nov 23 09:25:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit da3afdb69d426db6423c505f1c4ec10b9cd40304 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:41:41 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Automake 'foreign' option is specified in configure.ac. + Remove from Makefile.am + +commit a0b11f322c440ccf13347c42d08ed5e0b208d79c +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:09 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 963be32d684b32957d7e646eb19259d7710bf66a +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 12:54:21 2009 -0400 + + Several driver modules do not have a ChangeLog target in Makefile.am #23814 + + The git generated ChangeLog replaces the hand written one. + Update configure.ac to xorg-macros level 1.3. + Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros + Update Makefile.am to add ChangeLog target if missing + Remove ChangeLog from EXTRA_DIST or *CLEAN variables + This is a pre-req for the INSTALL_CMD + +commit 3e54585250d22541a31068b5b8f0c8743dbccce6 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:17 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + commit 2013b64cf19fce32edb052ee6d8529d3ce69d409 Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:28 2009 +1000 diff --git a/debian/changelog b/debian/changelog index 1e58174..21a8878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -xserver-xorg-video-mach64 (6.8.2-6) UNRELEASED; urgency=low +xserver-xorg-video-mach64 (6.9.0-1) UNRELEASED; urgency=low + [ Cyril Brulebois ] * Get rid of debian/NEWS, things from 2007/2008 are old now. This fixes the epoch mismatch and NEWS prompting on every upgrade, thanks to Jonathan Nieder for the notice (Closes: #615522). + [ Julien Cristau ] + * New upstream release, integrates fix for 1.10 compatibility. + -- Cyril Brulebois <[email protected]> Sun, 27 Feb 2011 12:12:05 +0100 xserver-xorg-video-mach64 (6.8.2-5+exp2) experimental; urgency=low commit ef55d1f123972ccc001bf8b41db45d281be35a62 Author: Julien Cristau <[email protected]> Date: Thu Apr 28 17:23:42 2011 +0200 Bump to 6.9.0 Signed-off-by: Julien Cristau <[email protected]> diff --git a/configure.ac b/configure.ac index f5ba21d..e4ab861 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mach64], - [6.8.2], + [6.9.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mach64]) AC_CONFIG_SRCDIR([Makefile.am]) commit 39c6d1da8af563afa665d5bb149c9693e24c6eab Author: Julien Cristau <[email protected]> Date: Thu Apr 28 17:31:52 2011 +0200 Replace deprecated xalloc/xfree/xrealloc with malloc/free/realloc Signed-off-by: Julien Cristau <[email protected]> diff --git a/src/aticonfig.c b/src/aticonfig.c index 9102497..621e79e 100644 --- a/src/aticonfig.c +++ b/src/aticonfig.c @@ -502,5 +502,5 @@ ATIProcessOptions #endif } - xfree(PublicOption); + free(PublicOption); } diff --git a/src/aticonsole.c b/src/aticonsole.c index 6e742d9..50cc6e1 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -799,19 +799,19 @@ ATIFreeScreen #ifndef AVOID_CPIO - xfree(pATI->OldHW.frame_buffer); - xfree(pATI->NewHW.frame_buffer); + free(pATI->OldHW.frame_buffer); + free(pATI->NewHW.frame_buffer); #endif /* AVOID_CPIO */ - xfree(pATI->pShadow); + free(pATI->pShadow); #ifndef AVOID_DGA - xfree(pATI->pDGAMode); + free(pATI->pDGAMode); #endif /* AVOID_DGA */ - xfree(pATI); + free(pATI); pScreenInfo->driverPrivate = NULL; } diff --git a/src/atidga.c b/src/atidga.c index fb6d1d7..c1cd163 100644 --- a/src/atidga.c +++ b/src/atidga.c @@ -324,7 +324,7 @@ ATIDGAAddModes if ((modePitch * bitsPerPixel * pMode->VDisplay) <= videoBits) { /* Stop generating modes on out-of-memory conditions */ - pDGAMode = xrealloc(pATI->pDGAMode, + pDGAMode = realloc(pATI->pDGAMode, (pATI->nDGAMode + 1) * SizeOf(DGAModeRec)); if (!pDGAMode) break; diff --git a/src/atidri.c b/src/atidri.c index 15d0014..9c6719b 100644 --- a/src/atidri.c +++ b/src/atidri.c @@ -109,14 +109,14 @@ static Bool ATIInitVisualConfigs( ScreenPtr pScreen ) pATIConfigs = (ATIConfigPrivPtr) xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs ); if ( !pATIConfigs ) { - xfree( pConfigs ); + free( pConfigs ); return FALSE; } pATIConfigPtrs = (ATIConfigPrivPtr*) xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs ); if ( !pATIConfigPtrs ) { - xfree( pConfigs ); - xfree( pATIConfigs ); + free( pConfigs ); + free( pATIConfigs ); return FALSE; } @@ -190,14 +190,14 @@ static Bool ATIInitVisualConfigs( ScreenPtr pScreen ) pATIConfigs = (ATIConfigPrivPtr) xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs ); if ( !pATIConfigs ) { - xfree( pConfigs ); + free( pConfigs ); return FALSE; } pATIConfigPtrs = (ATIConfigPrivPtr*) xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs ); if ( !pATIConfigPtrs ) { - xfree( pConfigs ); - xfree( pATIConfigs ); + free( pConfigs ); + free( pATIConfigs ); return FALSE; } @@ -553,11 +553,11 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg, if (nbox > 1) { /* Keep ordering in each band, reverse order of bands */ - pboxNew1 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox); + pboxNew1 = (BoxPtr)malloc(sizeof(BoxRec)*nbox); if (!pboxNew1) return; - pptNew1 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox); + pptNew1 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox); if (!pptNew1) { - xfree(pboxNew1); + free(pboxNew1); return; } pboxBase = pboxNext = pbox+nbox-1; @@ -588,13 +588,13 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg, if (nbox > 1) { /* reverse order of rects in each band */ - pboxNew2 = (BoxPtr)xalloc(sizeof(BoxRec)*nbox); - pptNew2 = (DDXPointPtr)xalloc(sizeof(DDXPointRec)*nbox); + pboxNew2 = (BoxPtr)malloc(sizeof(BoxRec)*nbox); + pptNew2 = (DDXPointPtr)malloc(sizeof(DDXPointRec)*nbox); if (!pboxNew2 || !pptNew2) { - xfree(pptNew2); - xfree(pboxNew2); - xfree(pptNew1); - xfree(pboxNew1); + free(pptNew2); + free(pboxNew2); + free(pptNew1); + free(pboxNew1); return; } pboxBase = pboxNext = pbox; @@ -665,10 +665,10 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg, outf(SRC_OFF_PITCH, pATI->NewHW.dst_off_pitch); outf(DST_OFF_PITCH, pATI->NewHW.src_off_pitch); - xfree(pptNew2); - xfree(pboxNew2); - xfree(pptNew1); - xfree(pboxNew1); + free(pptNew2); + free(pboxNew2); + free(pptNew1); + free(pboxNew1); ATIDRIMarkSyncInt(pScreenInfo); #endif @@ -1237,7 +1237,7 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen ) if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) { pDRIInfo->busIdString = DRICreatePCIBusID(pATI->PCIInfo); } else { - pDRIInfo->busIdString = xalloc( 64 ); + pDRIInfo->busIdString = malloc( 64 ); sprintf( pDRIInfo->busIdString, "PCI:%d:%d:%d", PCI_DEV_BUS(pATI->PCIInfo), @@ -1283,7 +1283,7 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen ) pATIDRIServer = (ATIDRIServerInfoPtr) xnfcalloc( sizeof(ATIDRIServerInfoRec), 1 ); if ( !pATIDRIServer ) { - xfree( pATIDRI ); + free( pATIDRI ); DRIDestroyInfoRec( pATI->pDRIInfo ); pATI->pDRIInfo = NULL; xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR, @@ -1322,9 +1322,9 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen ) pATI->have3DWindows = FALSE; if ( !DRIScreenInit( pScreen, pDRIInfo, &pATI->drmFD ) ) { - xfree( pATIDRIServer ); + free( pATIDRIServer ); pATI->pDRIServerInfo = NULL; - xfree( pDRIInfo->devPrivate ); + free( pDRIInfo->devPrivate ); pDRIInfo->devPrivate = NULL; DRIDestroyInfoRec( pDRIInfo ); pDRIInfo = NULL; @@ -1619,22 +1619,22 @@ void ATIDRICloseScreen( ScreenPtr pScreen ) /* De-allocate all DRI data structures */ if ( pATI->pDRIInfo ) { if ( pATI->pDRIInfo->devPrivate ) { - xfree( pATI->pDRIInfo->devPrivate ); + free( pATI->pDRIInfo->devPrivate ); pATI->pDRIInfo->devPrivate = NULL; } DRIDestroyInfoRec( pATI->pDRIInfo ); pATI->pDRIInfo = NULL; } if ( pATI->pDRIServerInfo ) { - xfree( pATI->pDRIServerInfo ); + free( pATI->pDRIServerInfo ); pATI->pDRIServerInfo = NULL; } if ( pATI->pVisualConfigs ) { - xfree( pATI->pVisualConfigs ); + free( pATI->pVisualConfigs ); pATI->pVisualConfigs = NULL; } if ( pATI->pVisualConfigsPriv ) { - xfree( pATI->pVisualConfigsPriv ); + free( pATI->pVisualConfigsPriv ); pATI->pVisualConfigsPriv = NULL; } } diff --git a/src/atii2c.c b/src/atii2c.c index a13d647..6e3a7ef 100644 --- a/src/atii2c.c +++ b/src/atii2c.c @@ -324,7 +324,7 @@ ATICreateI2CBusRec if (!(pI2CBus = xf86CreateI2CBusRec())) { xf86DrvMsg(iScreen, X_WARNING, "Unable to allocate I2C Bus record.\n"); - xfree(pATII2C); + free(pATII2C); return NULL; } @@ -348,7 +348,7 @@ ATICreateI2CBusRec xf86DrvMsg(iScreen, X_WARNING, "I2C bus %s initialisation failure.\n", BusName); xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE); - xfree(pATII2C); + free(pATII2C); return NULL; } @@ -392,8 +392,8 @@ ATII2CFreeScreen pATII2C = pI2CBus->DriverPrivate.ptr; xf86DestroyI2CBusRec(pI2CBus, TRUE, TRUE); - xfree(pATII2C); + free(pATII2C); } - xfree(ppI2CBus); + free(ppI2CBus); } diff --git a/src/atimach64exa.c b/src/atimach64exa.c index 67c5f22..a3e49bf 100644 --- a/src/atimach64exa.c +++ b/src/atimach64exa.c @@ -686,7 +686,7 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen) pATI->RenderAccelEnabled ? "enabled" : "disabled"); if (!exaDriverInit(pScreen, pATI->pExa)) { - xfree(pATI->pExa); + free(pATI->pExa); pATI->pExa = NULL; return FALSE; } diff --git a/src/atimach64i2c.c b/src/atimach64i2c.c index 0f7d797..2f243e5 100644 --- a/src/atimach64i2c.c +++ b/src/atimach64i2c.c @@ -347,7 +347,7 @@ ATITVAddOnProbe return TRUE; } - xfree(pI2CDev); + free(pI2CDev); return FALSE; } diff --git a/src/atimach64probe.c b/src/atimach64probe.c index 2d554e1..0117920 100644 --- a/src/atimach64probe.c +++ b/src/atimach64probe.c @@ -234,7 +234,7 @@ Mach64Probe(DriverPtr pDriver, int flags) Mach64Chipsets, Mach64PciChipsets, devSections, numDevSections, pDriver, &usedChips); - xfree(devSections); + free(devSections); if (numUsed <= 0) return FALSE; @@ -248,7 +248,7 @@ Mach64Probe(DriverPtr pDriver, int flags) } } - xfree(usedChips); + free(usedChips); return ProbeSuccess; } diff --git a/src/atimach64xv.c b/src/atimach64xv.c index 2c9b812..66bd953 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -1467,8 +1467,8 @@ ATIMach64XVInitialiseAdaptor if (pppAdaptor) *pppAdaptor = ppAdaptor; else { - xfree(ppAdaptor[0]); - xfree(ppAdaptor); + free(ppAdaptor[0]); + free(ppAdaptor); } return 1; @@ -1505,9 +1505,9 @@ ATIXVFreeAdaptorInfo return; while (nAdaptor > 0) - xfree(ppAdaptor[--nAdaptor]); + free(ppAdaptor[--nAdaptor]); - xfree(ppAdaptor); + free(ppAdaptor); } /* diff --git a/src/atimode.c b/src/atimode.c index d1b3198..00817f0 100644 --- a/src/atimode.c +++ b/src/atimode.c @@ -114,7 +114,7 @@ ATISwap if (!pATIHW->frame_buffer) { pATIHW->frame_buffer = - (pointer)xalloc(pATIHW->nBank * pATIHW->nPlane * 0x00010000U); + (pointer)malloc(pATIHW->nBank * pATIHW->nPlane * 0x00010000U); if (!pATIHW->frame_buffer) { xf86DrvMsg(iScreen, X_WARNING, diff --git a/src/atipreinit.c b/src/atipreinit.c index 34b851c..2776a48 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -560,7 +560,7 @@ ATIPreInit pATI->Chip = pEntity->chipset; pVideo = xf86GetPciInfoForEntity(pATI->iEntity); - xfree(pEntity); + free(pEntity); #ifndef XSERVER_LIBPCIACCESS if (!pResources) diff --git a/src/atiscreen.c b/src/atiscreen.c index cf79c37..f8e23c9 100644 --- a/src/atiscreen.c +++ b/src/atiscreen.c @@ -388,7 +388,7 @@ ATIScreenInit { pATI->FBBytesPerPixel = pATI->bitsPerPixel >> 3; pATI->FBPitch = PixmapBytePad(pATI->displayWidth, pATI->depth); - if ((pATI->pShadow = xalloc(pATI->FBPitch * pScreenInfo->virtualY))) + if ((pATI->pShadow = malloc(pATI->FBPitch * pScreenInfo->virtualY))) { pFB = pATI->pShadow; } @@ -646,7 +646,7 @@ ATICloseScreen if (pATI->pExa) { exaDriverFini(pScreen); - xfree(pATI->pExa); + free(pATI->pExa); pATI->pExa = NULL; } #endif @@ -669,13 +669,13 @@ ATICloseScreen #ifdef USE_XAA if (!pATI->useEXA) { - xfree(pATI->ExpansionBitmapScanlinePtr[1]); + free(pATI->ExpansionBitmapScanlinePtr[1]); pATI->ExpansionBitmapScanlinePtr[0] = NULL; pATI->ExpansionBitmapScanlinePtr[1] = NULL; } #endif - xfree(pATI->pShadow); + free(pATI->pShadow); pATI->pShadow = NULL; pScreenInfo->pScreen = NULL; commit 483f0eed471976d0c21da38f583bafc4425a450b Author: Cyril Brulebois <[email protected]> Date: Fri Feb 25 15:38:31 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 14e944a..5dd87d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-mach64 (6.8.2-5+exp2) UNRELEASED; urgency=low +xserver-xorg-video-mach64 (6.8.2-5+exp2) experimental; urgency=low * Rebuild against Xserver 1.10 rc3. - -- Cyril Brulebois <[email protected]> Fri, 25 Feb 2011 15:38:20 +0100 + -- Cyril Brulebois <[email protected]> Fri, 25 Feb 2011 15:38:31 +0100 xserver-xorg-video-mach64 (6.8.2-5+exp1) experimental; urgency=low commit 4be4cb52a23c18fba3eae2a96bb15a143d3937fb Author: Cyril Brulebois <[email protected]> Date: Fri Feb 25 15:38:28 2011 +0100 Rebuild against Xserver 1.10 rc3. diff --git a/debian/changelog b/debian/changelog index e8141ae..14e944a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-mach64 (6.8.2-5+exp2) UNRELEASED; urgency=low + + * Rebuild against Xserver 1.10 rc3. + + -- Cyril Brulebois <[email protected]> Fri, 25 Feb 2011 15:38:20 +0100 + xserver-xorg-video-mach64 (6.8.2-5+exp1) experimental; urgency=low * Rebuild against Xserver 1.10 rc2. diff --git a/debian/control b/debian/control index 1448147..ee1462f 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.9.99.902), + xserver-xorg-dev (>= 2:1.9.99.903), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, commit 74b0b29df8000853cde47b0d918674b2e4e8bbc6 Author: Cyril Brulebois <[email protected]> Date: Sun Feb 20 14:12:23 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 6c102bd..e8141ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-video-mach64 (6.8.2-5+exp1) UNRELEASED; urgency=low +xserver-xorg-video-mach64 (6.8.2-5+exp1) experimental; urgency=low * Rebuild against Xserver 1.10 rc2. * Cherry-pick from upstream to build against 1.10: - mach64: fix the pixmap private API change. - -- Cyril Brulebois <[email protected]> Sun, 20 Feb 2011 14:07:39 +0100 + -- Cyril Brulebois <[email protected]> Sun, 20 Feb 2011 14:12:20 +0100 xserver-xorg-video-mach64 (6.8.2-5) unstable; urgency=low commit e256ee6f86cd490ebdee517ff12269ae9cb5cc64 Author: Cyril Brulebois <[email protected]> Date: Sun Feb 20 14:12:18 2011 +0100 Document the cherry-pick. diff --git a/debian/changelog b/debian/changelog index c2c8224..6c102bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xserver-xorg-video-mach64 (6.8.2-5+exp1) UNRELEASED; urgency=low * Rebuild against Xserver 1.10 rc2. + * Cherry-pick from upstream to build against 1.10: + - mach64: fix the pixmap private API change. -- Cyril Brulebois <[email protected]> Sun, 20 Feb 2011 14:07:39 +0100 commit 4c13db90bdb085a6974aaf596a57ac8224efc043 Author: Dave Airlie <[email protected]> Date: Thu Dec 2 19:11:05 2010 +1000 mach64: fix the pixmap private API change. (cherry picked from commit d60087f0b6dd4d082230312580ae35e14acd0c6e) Signed-off-by: Cyril Brulebois <[email protected]> diff --git a/src/aticonsole.c b/src/aticonsole.c index 8efe897..79e7a8e 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -28,6 +28,7 @@ #include "config.h" #endif +#include "xorgVersion.h" #include "ati.h" #include "aticonsole.h" #include "atii2c.h" @@ -689,7 +690,9 @@ ATIEnterVT ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); PixmapPtr pScreenPixmap; +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) DevUnion PixmapPrivate; +#endif Bool Entered; if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) @@ -714,19 +717,24 @@ ATIEnterVT } pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); + +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) PixmapPrivate = pScreenPixmap->devPrivate; if (!PixmapPrivate.ptr) pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; +#endif /* Tell framebuffer about remapped aperture */ Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, -1, -1, -1, -1, -1, pATI->pMemory); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) if (!PixmapPrivate.ptr) { pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; pScreenPixmap->devPrivate.ptr = NULL; } +#endif #ifdef XF86DRI_DEVEL commit 82a4df6fff3507d996332880cc03bb49a09cd7d9 Author: Cyril Brulebois <[email protected]> Date: Sun Feb 20 14:07:47 2011 +0100 Rebuild against Xserver 1.10 rc2. diff --git a/debian/changelog b/debian/changelog index 23b9305..c2c8224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-mach64 (6.8.2-5+exp1) UNRELEASED; urgency=low + + * Rebuild against Xserver 1.10 rc2. + + -- Cyril Brulebois <[email protected]> Sun, 20 Feb 2011 14:07:39 +0100 + xserver-xorg-video-mach64 (6.8.2-5) unstable; urgency=low * Switch to dh: diff --git a/debian/control b/debian/control index 2b7f7f4..1448147 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.9.4), + xserver-xorg-dev (>= 2:1.9.99.902), x11proto-gl-dev, x11proto-xext-dev, x11proto-core-dev, commit d60087f0b6dd4d082230312580ae35e14acd0c6e Author: Dave Airlie <[email protected]> Date: Thu Dec 2 19:11:05 2010 +1000 mach64: fix the pixmap private API change. diff --git a/src/aticonsole.c b/src/aticonsole.c index 1be147e..6e742d9 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -28,6 +28,7 @@ #include "config.h" #endif +#include "xorgVersion.h" #include "ati.h" #include "aticonsole.h" #include "atii2c.h" @@ -689,7 +690,9 @@ ATIEnterVT ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); PixmapPtr pScreenPixmap; +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) DevUnion PixmapPrivate; +#endif Bool Entered; if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) @@ -714,19 +717,24 @@ ATIEnterVT } pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); + +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) PixmapPrivate = pScreenPixmap->devPrivate; if (!PixmapPrivate.ptr) pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; +#endif /* Tell framebuffer about remapped aperture */ Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, -1, -1, -1, -1, -1, pATI->pMemory); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) if (!PixmapPrivate.ptr) { pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; pScreenPixmap->devPrivate.ptr = NULL; } +#endif #ifdef XF86DRI_DEVEL commit e7bc106247d9ba10a922936e137a4f5ecc54ef9e Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 09:37:17 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
