COPYING | 109 ++++++++++++++++++++++++++++++++++++++++++++++---- README | 13 ++++- configure.ac | 6 ++ src/atibus.c | 3 - src/atimach64.c | 5 ++ src/atimach64render.c | 6 ++ src/atipreinit.c | 18 +++++++- src/atistruct.h | 8 ++- 8 files changed, 149 insertions(+), 19 deletions(-)
New commits: commit 2013b64cf19fce32edb052ee6d8529d3ce69d409 Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:28 2009 +1000 mach64: bump for release 6.8.2 diff --git a/configure.ac b/configure.ac index 68e2a5f..2e6bc91 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-mach64], - 6.8.1, + 6.8.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mach64) commit 4f08e83e50059df494f5f53cd05eb8809d18656e Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 mach64: change to using ABI version check diff --git a/src/atipreinit.c b/src/atipreinit.c index 6c742fd..34b851c 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -52,7 +52,7 @@ #include "atixv.h" #include "vbe.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #endif diff --git a/src/atistruct.h b/src/atistruct.h index ac76b1f..5225256 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -59,7 +59,7 @@ #endif #include "xf86Cursor.h" #include "xf86Pci.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #endif commit 64960253ea5dcfb01d92b5b684790f16be5b73be Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:31 2009 +1000 mach64: update for resources/RAC API removal diff --git a/src/atibus.c b/src/atibus.c index 69a3089..7b6cb48 100644 --- a/src/atibus.c +++ b/src/atibus.c @@ -59,6 +59,7 @@ ATIClaimResources ) { +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO resRange Resources[2] = {{0, 0, 0}, _END}; @@ -101,7 +102,7 @@ ATIClaimResources } #endif /* AVOID_CPIO */ - +#endif } /* diff --git a/src/atipreinit.c b/src/atipreinit.c index 2b84a6c..6c742fd 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -52,7 +52,9 @@ #include "atixv.h" #include "vbe.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" +#endif /* * FreeScreen handles the clean-up. @@ -507,7 +509,9 @@ ATIPreInit ATIPtr pATI; GDevPtr pGDev; EntityInfoPtr pEntity; +#ifndef XSERVER_LIBPCIACCESS resPtr pResources; +#endif pciVideoPtr pVideo; DisplayModePtr pMode; CARD32 IOValue; @@ -548,7 +552,9 @@ ATIPreInit /* Register resources */ pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]); pGDev = pEntity->device; +#ifndef XSERVER_LIBPCIACCESS pResources = pEntity->resources; +#endif pATI->iEntity = pEntity->index; pATI->Chip = pEntity->chipset; @@ -556,6 +562,7 @@ ATIPreInit xfree(pEntity); +#ifndef XSERVER_LIBPCIACCESS if (!pResources) pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared); if (pResources) @@ -565,7 +572,7 @@ ATIPreInit xf86FreeResList(pResources); return FALSE; } - +#endif ConfiguredMonitor = NULL; (void)memset(BIOS, 0, SizeOf(BIOS)); @@ -753,6 +760,7 @@ ATIPreInit #endif /* AVOID_CPIO */ +#ifndef XSERVER_LIBPCIACCESS #ifdef AVOID_CPIO pScreenInfo->racMemFlags = @@ -765,7 +773,7 @@ ATIPreInit pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR; #endif /* AVOID_CPIO */ - +#endif /* Finish private area initialisation */ pATI->nFIFOEntries = 16; /* For now */ @@ -1056,6 +1064,7 @@ ATIPreInit xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "%s.\n", Buffer); } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->CPIO_VGAWonder) @@ -1064,6 +1073,7 @@ ATIPreInit pATI->CPIO_VGAWonder); #endif /* AVOID_CPIO */ +#endif xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "ATI Mach64 adapter detected.\n"); @@ -1174,6 +1184,7 @@ ATIPreInit xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Using Mach64 accelerator CRTC.\n"); +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1206,6 +1217,7 @@ ATIPreInit } #endif /* AVOID_CPIO */ +#endif } @@ -1961,6 +1973,7 @@ ATIPreInit } } +#ifndef XSERVER_LIBPCIACCESS #ifndef AVOID_CPIO if (pATI->VGAAdapter) @@ -1981,6 +1994,7 @@ ATIPreInit } #endif /* AVOID_CPIO */ +#endif /* * Remap apertures. Must lock and re-unlock around this in case the diff --git a/src/atistruct.h b/src/atistruct.h index b9f4d08..ac76b1f 100644 --- a/src/atistruct.h +++ b/src/atistruct.h @@ -59,7 +59,9 @@ #endif #include "xf86Cursor.h" #include "xf86Pci.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "atipcirename.h" @@ -269,9 +271,9 @@ typedef struct _ATIRec CARD8 BusType; #ifndef AVOID_CPIO - - resRange VGAWonderResources[2]; - +#ifndef XSERVER_LIBPCIACCESS + resRange VGAWonderResources[2]; +#endif #endif /* AVOID_CPIO */ /* commit 965614f27d42106e859000264a6eb89d9fcba67e Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:43:33 2009 +1000 Update to xextproto 7.1 support. DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index e22b987..68e2a5f 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. diff --git a/src/atimach64.c b/src/atimach64.c index c7b0ecc..e3897ea 100644 --- a/src/atimach64.c +++ b/src/atimach64.c @@ -63,10 +63,15 @@ #include "atimach64io.h" #include "atirgb514.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #ifndef DPMS_SERVER # define DPMS_SERVER #endif #include <X11/extensions/dpms.h> +#endif + /* * ATIMach64PreInit -- commit 9caef14defaf892d957875f6d774003a036bad45 Author: Alan Coopersmith <[email protected]> Date: Mon May 11 22:06:40 2009 -0700 Fill in COPYING file, add SubmittingPatches URL to README diff --git a/COPYING b/COPYING index 7f33cbf..8ddc658 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,105 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [email protected] -Please submit updated COPYING files to the Xorg bugzilla: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +************************************************************************* -http://lists.freedesktop.org/mailman/listinfo/xorg +Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, + Precision Insight, Inc., Cedar Park, Texas, and + VA Linux Systems Inc., Fremont, California. + +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX +SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +************************************************************************* +Copyright 2000 Gareth Hughes +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +************************************************************************* + +Copyright 2006, 2007 George Sapountzis +All Rights Reserved. + +Based on the mach64 DRI and DRM drivers: +Copyright 2000 Gareth Hughes +Copyright 2002-2003 Leif Delgass +All Rights Reserved. + +Based on the ati hw/kdrive driver: +Copyright 2003 Eric Anholt, Anders Carlsson + +Based on the via hw/xfree86 driver: +Copyright 2006 Thomas Hellstrom. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README b/README index 143816b..f2e2bb5 100644 --- a/README +++ b/README @@ -1,20 +1,25 @@ xf86-video-mach64 - ATI Mach64 driver for the Xorg X server -Please submit bugs & patches to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - All questions regarding this software should be directed at the Xorg mailing list: http://lists.freedesktop.org/mailman/listinfo/xorg +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + The master development code repository can be found at: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mach64 http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64 +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + For more information on the git code manager, see: http://wiki.x.org/wiki/GitPage + commit d9d787167795862909738892195fcdc751c413ed Author: Alan Coopersmith <[email protected]> Date: Sun May 10 16:56:02 2009 -0700 Doublecheck pictFormat is a supported format Fixes these warnings from parfait source checker: Error: Read buffer overflow at src/atimach64render.c:601 in function 'Mach64PrepareTexture' [Symbolic analysis] In array dereference of Mach64TexFormats[i] with index 'i' Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 Error: Read buffer overflow at src/atimach64render.c:712 in function 'Mach64PrepareComposite' [Symbolic analysis] In array dereference of Mach64TexFormats[i] with index 'i' Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/src/atimach64render.c b/src/atimach64render.c index dda3938..1e9485e 100644 --- a/src/atimach64render.c +++ b/src/atimach64render.c @@ -598,6 +598,9 @@ Mach64PrepareTexture(PicturePtr pPict, PixmapPtr pPix) if (Mach64TexFormats[i].pictFormat == pPict->format) break; } + if (i == MACH64_NR_TEX_FORMATS) + MACH64_FALLBACK(("Unsupported picture format 0x%x\n", + (int)pPict->format)); texFormat = Mach64TexFormats[i].texFormat; /* Prepare picture size */ @@ -709,6 +712,9 @@ Mach64PrepareComposite if (Mach64TexFormats[i].pictFormat == pDstPicture->format) break; } + if (i == MACH64_NR_TEX_FORMATS) + MACH64_FALLBACK(("Unsupported picture format 0x%x\n", + (int)pPict->format)); dstFormat = Mach64TexFormats[i].dstFormat; m3d->dp_pix_width = SetBits(dstFormat, DP_DST_PIX_WIDTH) | -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
