.gitignore | 70 ++++++++++++++++++++-- ChangeLog | 87 ---------------------------- Makefile.am | 11 +++ configure.ac | 19 ++++-- man/.gitignore | 2 man/Makefile.am | 41 ++++++------- man/sis.man | 2 src/.gitignore | 6 - src/sis.h | 4 - src/sis_driver.c | 169 +++++-------------------------------------------------- src/sis_video.c | 4 - 11 files changed, 128 insertions(+), 287 deletions(-)
New commits: commit d33e45dcaee511d5f09ac5f68680e96f3ad60076 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Jan 15 13:55:44 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/man/Makefile.am b/man/Makefile.am index d076dc4..1b26ac2 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# 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. -# -# The above copyright notice and this permission notice 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 OPEN GROUP 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. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# 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. # drivermandir = $(DRIVER_MAN_DIR) commit 2c9baaaa8ace01d94e95ca4ad7216146339940dd Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Dec 15 21:47:35 2009 -0500 configure.ac: use backticks rather than $() for cmd subs Use "$PKG_CONFIG" rather than hard coded "pkg-config" Acked-by: Dan Nicholson <dbn.li...@gmail.com> Acked-by: Daniel Stone <dan...@fooishbar.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 440dc0c..6705994 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ 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) +sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` # Checks for libraries. commit cbfa94ccb1ee6213342014f3c7063362acb274ff Author: Gaetan Nadon <mems...@videotron.ca> 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. diff --git a/Makefile.am b/Makefile.am index 94f35e1..9ab8bf9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src man +MAINTAINERCLEANFILES = ChangeLog INSTALL if BUILD_LINUXDOC README: README.sgml commit a69569c72ea19d4d76c57a8077542fee4aeb501a Author: Gaetan Nadon <mems...@videotron.ca> 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 diff --git a/Makefile.am b/Makefile.am index 282009b..94f35e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src man if BUILD_LINUXDOC commit 8d766ddd89a4d9d5c02ad186b049cca2d806a3d8 Author: Gaetan Nadon <mems...@videotron.ca> 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. diff --git a/Makefile.am b/Makefile.am index b977983..282009b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,9 +27,12 @@ README: README.sgml endif EXTRA_DIST = README.sgml -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 48f844b..440dc0c 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit b92482e522d3b8a6526c05bf491d3e768f282714 Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Oct 26 12:54:22 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 diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 67b5b35..0000000 --- a/ChangeLog +++ /dev/null @@ -1,87 +0,0 @@ -2006-06-06 Donnie Berkholz <spyder...@gentoo.org> - - * src/sis_dri.c: - Add missing #include <assert.h>. - -2006-04-30 Alex Deucher <ag...@yahoo.com> - - * src/sis300_accel.c: (SiS300AccelInit): - * src/sis310_accel.c: - * src/sis_accel.c: (SiSAccelInit): - - fix minor typo - -2006-04-07 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - * src/sis.h: - Bump to 0.9.1 for Xv changes. - -2006-04-07 Aaron Plattner <aplatt...@nvidia.com> - - * src/sis6326_video.c: - * src/sis_video.c: (SISPutImage): - * src/sis_video.h: - Add a DrawablePtr argument to the XV functions to pave the way for - redirected video. - -2006-04-07 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - * src/sis.h: - Unlibcwrap. Bump server version requirement. Bump to 0.9.0. - -2006-04-06 Eric Anholt <anh...@freebsd.org> - - * src/sis_driver.c: - Don't forget to zero the xf86ModReqInfo before using it. - Noticed by Alex Deucher. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-12-01 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - Bug #5207: Enable EXA. (Thomas Winischofer) - -2005-11-20 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - Bump libdrm dep to 2.0. - -2005-11-29 Adam Jackson <a...@freedesktop.org> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 2b6c46a..b977983 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,3 +27,9 @@ README: README.sgml endif EXTRA_DIST = README.sgml +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 079faa4..48f844b 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -124,9 +130,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=sis AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - XORG_CHECK_LINUXDOC AC_OUTPUT([ commit 8655ebf788bb281f3f566d6335943527155b91a5 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Oct 22 13:04:14 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. diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 9730646..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo commit ef03b3abab51a5bf81813a524d177370053ddfa0 Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Oct 22 12:34:18 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. diff --git a/.gitignore b/.gitignore index 2df4a8d..01f9d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,78 @@ -Makefile -Makefile.in -*.la -*.lo +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing -stamp-h1 +mkinstalldirs +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86-video-sis +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Author: Matteo Delfino <kendats...@gmail.com> Date: Wed Oct 21 10:26:45 2009 -0400 Fix BIOS read on 650 and 760. (#19070) Signed-off-by: Matteo Delfino <kendats...@gmail.com> Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/sis_driver.c b/src/sis_driver.c index 994b02d..b19e7a9 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) case SIS_315H: case SIS_330: case SIS_340: + case SIS_650: + case SIS_760: case XGI_40: readpci = TRUE; break; case XGI_20: readpci = TRUE; commit 9e50319293b10508bba4e3acef4a2851e7ab1f7a Author: Dave Airlie <airl...@redhat.com> Date: Thu Jul 30 12:04:29 2009 +1000 sis: bump for release 0.10.2 diff --git a/configure.ac b/configure.ac index f19c1b7..079faa4 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], - 0.10.1, + 0.10.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sis) commit 8c3eca873717e877048c2bde345c02b1e9099e50 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 15:22:41 2009 +1000 sis: change to using ABI version check diff --git a/src/sis.h b/src/sis.h index e859c78..400b83f 100644 --- a/src/sis.h +++ b/src/sis.h @@ -77,7 +77,7 @@ #include "xf86Pci.h" #include "xf86Priv.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #endif #include "xf86.h" diff --git a/src/sis_driver.c b/src/sis_driver.c index bb11cbb..994b02d 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -49,7 +49,7 @@ #include "sis.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #endif #include "dixstruct.h" commit 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 28 13:32:37 2009 +1000 sis: update for resources/RAC API removal diff --git a/src/sis.h b/src/sis.h index 773f709..e859c78 100644 --- a/src/sis.h +++ b/src/sis.h @@ -77,7 +77,9 @@ #include "xf86Pci.h" #include "xf86Priv.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "xf86.h" #include "xf86PciInfo.h" #include "xf86Cursor.h" diff --git a/src/sis_driver.c b/src/sis_driver.c index a1ced97..bb11cbb 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -49,7 +49,9 @@ #include "sis.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" +#endif #include "dixstruct.h" #include "shadowfb.h" #include "fb.h" @@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) SiS_MapVGAMem(pScrn); #endif +#ifndef XSERVER_LIBPCIACCESS /* Set operating state */ /* 1. memory */ @@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) /* Operations for which I/O access is required */ pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; +#endif + /* Load ramdac module */ if(!xf86LoadSubModule(pScrn, "ramdac")) { SISErrorLog(pScrn, "Could not load ramdac module\n"); @@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n", (ULong)pSiS->IOAddress, pSiS->mmioSize); +#ifndef XSERVER_LIBPCIACCESS /* Register the PCI-assigned resources */ if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) { SISErrorLog(pScrn, "PCI resource conflicts detected\n"); @@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) SISFreeRec(pScrn); return FALSE; } +#endif from = X_PROBED; if(pSiS->pEnt->device->videoRam != 0) { commit 59ea80738d22c69a2850fd7ff89bd75330cc310b Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu Jul 16 11:55:25 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 <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 089c5fa..f19c1b7 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $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/sis_driver.c b/src/sis_driver.c index ef7b522..a1ced97 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -78,8 +78,13 @@ #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #ifdef XF86DRI #include "dri.h" commit 74553b5ee476a0dd28e136f5a33a546ea0c3ef28 Author: Adam Jackson <a...@redhat.com> Date: Thu May 28 15:19:25 2009 -0400 Remove useless loader symbol lists. diff --git a/src/sis_driver.c b/src/sis_driver.c index 5d0f51f..ef7b522 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -191,127 +191,6 @@ static PciChipsets XGIPciChipsets[] = { { -1, -1, RES_UNDEFINED } }; -#ifdef SIS_USE_XAA -static const char *xaaSymbols[] = { - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAHelpPatternROP", - "XAAInit", - NULL -}; -#endif - -#ifdef SIS_USE_EXA -static const char *exaSymbols[] = { - "exaDriverAccel", - "exaDriverInit", - "exaDriverFini", - "exaOffscreenAlloc", - "exaOffscreenFree", - NULL -}; -#endif - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86SetDDCproperties", - "xf86InterpretEDID", - NULL -}; - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - -static const char *vbeSymbols[] = { -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) - "VBEInit", -#else - "VBEExtendedInit", -#endif - "vbeDoEDID", - "vbeFree", - "VBEGetVBEInfo", - "VBEFreeVBEInfo", - "VBEGetModeInfo", - "VBEFreeModeInfo", - "VBESaveRestore", - "VBESetVBEMode", - "VBEGetVBEMode", - "VBESetDisplayStart", - "VBESetGetLogicalScanlineLength", - NULL -}; - -#ifdef XF86DRI -static const char *drmSymbols[] = { - "drmAddMap", - "drmAgpAcquire", - "drmAgpRelease", - "drmAgpAlloc", - "drmAgpFree", - "drmAgpBase", - "drmAgpBind", - "drmAgpUnbind", - "drmAgpEnable", - "drmAgpGetMode", - "drmCtlInstHandler", - "drmCtlUninstHandler", - "drmGetInterruptFromBusID", -#ifndef SISHAVEDRMWRITE - "drmSiSAgpInit", -#else - "drmCommandWrite", -#endif -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) - "drmGetVersion", - "drmFreeVersion", -#endif - NULL -}; - -static const char *driSymbols[] = { - "DRICreateInfoRec", - "DRIScreenInit", - "DRIFinishScreenInit", - "DRIDestroyInfoRec", - "DRICloseScreen", - "DRIGetSAREAPrivate", - "DRILock", - "DRIUnlock", - "DRIQueryVersion", - "GlxSetVisualConfigs", - NULL -}; - -#ifdef XFree86LOADER -static const char *driRefSymbols[] = { - "DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */ - NULL -}; -#endif -#endif /* XF86DRI */ - #ifdef XFree86LOADER static MODULESETUPPROTO(sisSetup); @@ -347,19 +226,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin) if(!setupDone) { setupDone = TRUE; xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs); - LoaderRefSymLists(fbSymbols, -#ifdef SIS_USE_XAA - xaaSymbols, -#endif -#ifdef SIS_USE_EXA - exaSymbols, -#endif - shadowSymbols, ramdacSymbols, - vbeSymbols, int10Symbols, -#ifdef XF86DRI - drmSymbols, driSymbols, driRefSymbols, -#endif - NULL); return (pointer)TRUE; } @@ -2949,7 +2815,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn) if(pSiS->pVbe) return; if(xf86LoadSubModule(pScrn, "vbe")) { - xf86LoaderReqSymLists(vbeSymbols, NULL); #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index); #else @@ -3628,7 +3493,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing adapter through int10\n"); if(xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); pSiS->pInt = xf86InitInt10(pSiS->pEnt->index); } else { SISErrorLog(pScrn, "Failed to load int10 module\n"); @@ -3718,8 +3582,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) goto my_error_1; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); - /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -6086,7 +5948,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { if(xf86LoadSubModule(pScrn, "ddc")) { int crtnum = 0; - xf86LoaderReqSymLists(ddcSymbols, NULL); if((pMonitor = SiSDoPrivateDDC(pScrn, &crtnum))) { didddc2 = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_PROBED, ddcsstr, crtnum); @@ -6119,8 +5980,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) if(xf86LoadSubModule(pScrn, "ddc")) { - xf86LoaderReqSymLists(ddcSymbols, NULL); - /* Now load and initialize VBE module. */ SiS_LoadInitVBE(pScrn); @@ -6957,18 +6816,15 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel); goto my_error_1; } - xf86LoaderReqSymLists(fbSymbols, NULL); /* Load XAA/EXA (if needed) */ if(!pSiS->NoAccel) { - const char **symNames = NULL; #ifdef SIS_USE_XAA if(!pSiS->useEXA) { if (!xf86LoadSubModule(pScrn, "xaa")) { SISErrorLog(pScrn, "Could not load xaa module\n"); goto my_error_1; } - symNames = xaaSymbols; } #endif #ifdef SIS_USE_EXA @@ -6984,13 +6840,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) LoaderErrorMsg(NULL, "exa", errmaj, errmin); goto my_error_1; } - symNames = exaSymbols; } #endif - if(symNames) { - xf86LoaderReqSymLists(symNames, NULL); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n"); - } + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n"); } /* Load shadowfb (if needed) */ @@ -6999,7 +6851,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) SISErrorLog(pScrn, "Could not load shadowfb module\n"); goto my_error_1; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } /* Load the dri and glx modules if requested. */ @@ -7008,9 +6859,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) if(!xf86LoaderCheckSymbol("DRIScreenInit")) { if(xf86LoadSubModule(pScrn, "dri")) { if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) { - if(xf86LoadSubModule(pScrn, "glx")) { - xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); - } else { + if(!xf86LoadSubModule(pScrn, "glx")) { SISErrorLog(pScrn, "Failed to load glx module\n"); } } commit 933dd8f860883c613acb5bcdf6b66100dbdfa952 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri May 1 16:57:22 2009 -0700 Correct bounds check of blitClip array access Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS [This bug was found by the Parfait bug checking tool. For more information see http://research.sun.com/projects/parfait ] Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/src/sis_video.c b/src/sis_video.c index 912a2f5..7322efb 100644 --- a/src/sis_video.c +++ b/src/sis_video.c @@ -4174,7 +4174,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULong index, Bool shutdown) * adapt->flags but we provide it anyway. */ - if(index > NUM_BLIT_PORTS) return; + if(index >= NUM_BLIT_PORTS) return; REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]); @@ -4214,7 +4214,7 @@ SISPutImageBlit( SiS_Packet12_YUV MyPacket; Bool first; - if(index > NUM_BLIT_PORTS) return BadMatch; + if(index >= NUM_BLIT_PORTS) return BadMatch; if(!height || !width) return Success; commit 49c641b638ac36d2a559555c04a3bd2777c8d071 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri May 1 16:52:10 2009 -0700 Make sisRegs3D4 big enough to hold all values written to it Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752) writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20 [This bug was found by the Parfait bug checking tool. For more information see http://research.sun.com/projects/parfait ] Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/src/sis.h b/src/sis.h index 9bafd4b..773f709 100644 --- a/src/sis.h +++ b/src/sis.h @@ -747,7 +747,7 @@ typedef struct { UChar sisRegsGR[10]; UChar sisDAC[768]; UChar sisRegs3C4[0x80]; - UChar sisRegs3D4[0xff]; + UChar sisRegs3D4[0x100]; UChar sisRegs3C2; UChar sisCapt[0x60]; UChar sisVid[0x50]; commit 5583c2342d873c0998ae73828246356867285460 Author: Chris Ball <c...@laptop.org> Date: Fri Feb 27 10:57:35 2009 -0500 Revert "Build fixes for EXA3" This reverts commit 7adc184e5e0f3df00423ea99b325d24764c1c067. The EXA developers have backed out this ABI bump. Signed-off-by: Chris Ball <c...@laptop.org> diff --git a/configure.ac b/configure.ac index 59df62c..089c5fa 100644 --- a/configure.ac +++ b/configure.ac @@ -99,7 +99,6 @@ fi # technically this should be a configure flag. meh. AC_DEFINE(XF86EXA, 1, [Build support for Exa]) -AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle]) SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" diff --git a/src/sis300_accel.c b/src/sis300_accel.c -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ntpzg-0006gk...@alioth.debian.org