xserver-xorg-video-sis: Changes to 'upstream-experimental'
src/sis.h|1 -
src/sis_driver.c | 30 --
2 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 7d4402786b758de3e6ce2641e15a39d612d5c518
Author: Adam Jackson a...@redhat.com
Date: Mon Oct 15 19:11:30 2012 -0400
Stop including xf86Priv.h
As the name might suggest, it's server-private.
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/sis.h b/src/sis.h
index 46fca2a..20e6134 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -75,7 +75,6 @@
#include compiler.h
#include xf86Pci.h
-#include xf86Priv.h
#include xf86_OSproc.h
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
#include xf86Resources.h
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 46cfefd..cefe503 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -93,6 +93,10 @@
#include dri.h
#endif
+#ifndef DEFAULT_DPI
+#define DEFAULT_DPI 96
+#endif
+
/*
* LookupWindow was removed with video abi 11.
*/
commit 926d4f655c8491b68a338f50c810f6729686ec9f
Author: Adam Jackson a...@redhat.com
Date: Tue Sep 25 08:54:51 2012 -0400
Remove mibstore.h
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 4c9b9cb..46cfefd 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -57,7 +57,6 @@
#include fb.h
#include micmap.h
#include mipointer.h
-#include mibstore.h
#include edid.h
#define SIS_NEED_inSISREG
@@ -8883,7 +8882,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
}
pSiS-SiSFastVidCopyDone = TRUE;
-miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
commit 339fb3bc032b9f35b07b90480ae82a0fd352e078
Author: Jan Lindemann j...@jannet.de
Date: Thu Aug 30 20:09:10 2012 +0200
Replace xf86UnMapVidMem with pci_device_unmap_range
Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.
X.Org bug#18028 https://bugs.freedesktop.org/show_bug.cgi?id=18028
Bug found by Bryan Henderson bry...@giraffe-data.com
Signed-off-by: Julien Cristau jcris...@debian.org
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 61e8075..4c9b9cb 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7344,7 +7344,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
if(pSiSEnt-MapCountIOBase) {
pSiSEnt-MapCountIOBase--;
if((pSiSEnt-MapCountIOBase == 0) || (pSiSEnt-forceUnmapIOBase)) {
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pSiSEnt-IOBase,
(pSiS-mmioSize * 1024));
+#else
+ pci_device_unmap_range(pSiS-PciInfo, pSiSEnt-IOBase,
(pSiS-mmioSize * 1024));
+#endif
pSiSEnt-IOBase = NULL;
pSiSEnt-MapCountIOBase = 0;
pSiSEnt-forceUnmapIOBase = FALSE;
@@ -7355,7 +7359,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
if(pSiSEnt-MapCountIOBaseDense) {
pSiSEnt-MapCountIOBaseDense--;
if((pSiSEnt-MapCountIOBaseDense == 0) ||
(pSiSEnt-forceUnmapIOBaseDense)) {
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex,
(pointer)pSiSEnt-IOBaseDense, (pSiS-mmioSize * 1024));
+#else
+ pci_device_unmap_range(pSiS-PciInfo,
(pointer)pSiSEnt-IOBaseDense, (pSiS-mmioSize * 1024));
+#endif
pSiSEnt-IOBaseDense = NULL;
pSiSEnt-MapCountIOBaseDense = 0;
pSiSEnt-forceUnmapIOBaseDense = FALSE;
@@ -7366,7 +7374,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
if(pSiSEnt-MapCountFbBase) {
pSiSEnt-MapCountFbBase--;
if((pSiSEnt-MapCountFbBase == 0) || (pSiSEnt-forceUnmapFbBase)) {
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pSiSEnt-RealFbBase,
pSiS-FbMapSize);
+#else
+ pci_device_unmap_range(pSiS-PciInfo,
(pointer)pSiSEnt-RealFbBase, pSiS-FbMapSize);
+#endif
pSiSEnt-FbBase = pSiSEnt-RealFbBase = NULL;
pSiSEnt-MapCountFbBase = 0;
pSiSEnt-forceUnmapFbBase = FALSE;
@@ -7376,13 +7388,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
}
} else {
#endif
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pSiS-IOBase,
(pSiS-mmioSize * 1024));
+#else
+ pci_device_unmap_range(pSiS-PciInfo, (pointer)pSiS-IOBase,
(pSiS-mmioSize * 1024));
+#endif
pSiS-IOBase = NULL;
#ifdef __alpha__
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pSiS-IOBaseDense,
(pSiS-mmioSize * 1024));
+#else
+ pci_device_unmap_range(pSiS-PciInfo, (pointer)pSiS-IOBaseDense,
(pSiS-mmioSize * 1024));
+#endif
pSiS-IOBaseDense = NULL;
#endif
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn-scrnIndex, (pointer)pSiS-RealFbBase,
pSiS-FbMapSize);
+#else
+ pci_device_unmap_range(pSiS-PciInfo, (pointer)pSiS-RealFbBase,
pSiS-FbMapSize);
+#endif
pSiS-FbBase = pSiS-RealFbBase = NULL;
#ifdef SISDUALHEAD
}
--
To
xserver-xorg-video-sis: Changes to 'upstream-experimental'
COPYING | 143 +++-
Makefile.am |6
README | 110 +++
README.sgml | 235 -
configure.ac| 73 +-
man/Makefile.am | 34
man/sis.man | 28 ---
src/Makefile.am |1
src/compat-api.h| 99 ++
src/init.c |1
src/initextx.c | 18 +-
src/osdef.h | 24 +--
src/sis.h | 71 --
src/sis300_accel.c | 12 -
src/sis310_accel.c | 26 +--
src/sis6326_video.c | 10 -
src/sis_accel.c | 12 -
src/sis_cursor.c|8 -
src/sis_dac.c |8 -
src/sis_dac.h |4
src/sis_dga.c | 18 +-
src/sis_dri.c | 38 ++---
src/sis_driver.c| 367 +---
src/sis_driver.h| 22 +--
src/sis_memcpy.c| 12 -
src/sis_opt.c | 18 +-
src/sis_shadow.c| 22 +--
src/sis_utility.c | 64 -
src/sis_vga.c | 21 ++
src/sis_video.c | 20 +-
src/sispcirename.h | 29
src/vgatypes.h | 12 -
32 files changed, 820 insertions(+), 746 deletions(-)
New commits:
commit 8c5127a6815935635b84835055bf4c2501c0bf6e
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-sis: bump to version 0.10.7
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index e043c95..8ce57bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sis],
-[0.10.6],
+[0.10.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sis])
AC_CONFIG_SRCDIR([Makefile.am])
commit c3d8d70edd06b8ecedd341df8b33ba71c01e64b3
Author: Dave Airlie airl...@gmail.com
Date: Sun Jul 15 19:55:19 2012 +1000
sis: add xaa configure support
SIS is already plumbed to not need XAA, just hook it up.
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/configure.ac b/configure.ac
index 67994b2..e043c95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,24 @@ if test $DRI = yes; then
AC_DEFINE(SISDRI_DEVEL,1,[Enable developmental DRI driver support])
fi
+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])
+
# technically this should be a configure flag. meh.
AC_DEFINE(XF86EXA, 1, [Build support for Exa])
diff --git a/src/sis.h b/src/sis.h
index 5ea3eba..46fca2a 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -226,7 +226,7 @@
#define INCL_YUV_BLIT_ADAPTOR /* Include support for YUV-RGB blit adaptors
(VRAM queue mode only) */
#endif
-#if 1
+#ifdef HAVE_XAA_H
#define SIS_USE_XAA/* Include code for XAA */
#endif
commit 314d56d0addfaa5c24d14de675416b3aca7f4a19
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Fri Jun 29 20:40:01 2012 -0700
Make SiSRegInit SiSSetLVDSetc args match in both headers that define them
Adds include of sis_dac.h to init.c to force compilers to compare the
definitions, making it obvious that sis_dac.h defined an extra argument
to SiSSetLVDSetc that the function itself didn't have, and that SiSRegInit
expected an unsigned long (in the form of SISIOADDRESS), not the unsigned
short that sis_dac.h claimed to pass it.
Found by the Parfait 1.0 bug checking tool:
Error: Function Call Mismatch
Function call with extra args: Forward declaration of function
'SiSSetLVDSetc' does not match its definition
Function expects 1 argument (SiS_Private*); given 2 (SiS_Private*,
unsigned short)
at line 604 of driver/xf86-video-sis/src/sis_dac.c in function
'SiS300Restore'.
Function defined at line 1153 of driver/xf86-video-sis/src/init.c.
[repeated for each call]
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/src/init.c b/src/init.c
index 74df1f5..a232cb7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -59,6 +59,7 @@
#endif
#include init.h
+#include sis_dac.h
#ifdef SIS300
#include 300vtbl.h
diff --git a/src/sis_dac.c b/src/sis_dac.c
index 816d0c8..04276b6 100644
--- a/src/sis_dac.c
+++ b/src/sis_dac.c
@@ -601,7 +601,7 @@ SiS300Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
if(!(pSiS-UseVESA)) {
if(pSiS-VBFlags2 VB2_LVDS) {
SiSRegInit(pSiS-SiS_Pr,
xserver-xorg-video-sis: Changes to 'upstream-experimental'
.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 2c9b8ace01d94e95ca4ad7216146339940dd 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
xserver-xorg-video-sis: Changes to 'upstream-experimental'
configure.ac |3 +--
src/sis_driver.c | 20 +---
src/sis_driver.h |4
src/sis_utility.c | 18 --
4 files changed, 10 insertions(+), 35 deletions(-)
New commits:
commit 6ab99d8d66ccd77314760edcb6110db924be3dcf
Author: Dave Airlie airl...@redhat.com
Date: Mon Dec 22 14:38:17 2008 +1000
sis 0.10.1
diff --git a/configure.ac b/configure.ac
index 071bcda..089c5fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
-0.10.0,
+0.10.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
commit 7ae731c269a13613eed5ee8bef6cb9b6e82b74c6
Author: Matthieu Herrb matthieu.he...@laas.fr
Date: Thu Nov 6 23:40:34 2008 +0100
Fix build on alpha.
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 1f03227..5d0f51f 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7331,11 +7331,12 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn-scrnIndex, X_ERROR,
Unable to map IO dense aperture. %s (%d)\n,
strerror (err), err);
-#endif
+}
+#endif /* XSERVER_LIBPCIACCESS */
}
pSiS-IOBaseDense = pSiSEnt-IOBaseDense;
-} else
-#endif
+} else {
+#endif /* SISDUALHEAD */
#ifndef XSERVER_LIBPCIACCESS
pSiS-IOBaseDense = xf86MapPciMem(pScrn-scrnIndex, VIDMEM_MMIO,
pSiS-PciTag, pSiS-IOAddress, (pSiS-mmioSize * 1024));
@@ -7351,8 +7352,11 @@ SISMapMem(ScrnInfoPtr pScrn)
xf86DrvMsg (pScrn-scrnIndex, X_ERROR,
Unable to map IO dense aperture. %s (%d)\n,
strerror (err), err);
+}
+#endif /* XSERVER_LIBPCIACCESS */
+#ifdef SISDUALHEAD
+}
#endif
-
if(pSiS-IOBaseDense == NULL) {
SISErrorLog(pScrn, Could not map MMIO dense area\n);
return FALSE;
commit 31509152757643b32f42fe0a21d3b00137540e40
Author: Daniel Stone dan...@fooishbar.org
Date: Sun Jul 20 04:15:52 2008 +0300
Remove XFree86-Misc (PassMessage) support
The driver used PassMessage/HandleMessage from XFree86-Misc to ... just
return BadMatch. So how about we drop this bit of code, including an
additional dependency?
diff --git a/configure.ac b/configure.ac
index 796269a..071bcda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 96fd52d..1f03227 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -57,8 +57,6 @@
#include mibank.h
#include mipointer.h
#include mibstore.h
-#define _XF86MISC_SERVER_
-#include X11/extensions/xf86misc.h
#include edid.h
#define SIS_NEED_inSISREG
@@ -669,11 +667,7 @@ SISProbe(DriverPtr drv, int flags)
pScrn-LeaveVT = SISLeaveVT;
pScrn-FreeScreen = SISFreeScreen;
pScrn-ValidMode= SISValidMode;
-#ifdef X_XF86MiscPassMessage
- if(xf86GetVersion() = XF86_VERSION_NUMERIC(4,3,99,2,0)) {
- pScrn-HandleMessage = SISHandleMessage;
- }
-#endif
+
foundScreen = TRUE;
}
diff --git a/src/sis_driver.h b/src/sis_driver.h
index 2105ca2..5c90383 100644
--- a/src/sis_driver.h
+++ b/src/sis_driver.h
@@ -1577,10 +1577,6 @@ void SISAdjustFrame(int scrnIndex, int x, int y,
int flags);
#ifdef SISDUALHEAD
static Bool SISSaveScreenDH(ScreenPtr pScreen, int mode);
#endif
-#ifdef X_XF86MiscPassMessage
-extern int SISHandleMessage(int scrnIndex, const char *msgtype,
- const char *msgval, char **retmsg);
-#endif
static void SISFreeScreen(int scrnIndex, int flags);
static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
diff --git a/src/sis_utility.c b/src/sis_utility.c
index bbc7629..a9bcd2b 100644
--- a/src/sis_utility.c
+++ b/src/sis_utility.c
@@ -38,8 +38,6 @@
#define NEED_EVENTS
#include X11/X.h
#include dixstruct.h
-#define _XF86MISC_SERVER_
-#include X11/extensions/xf86misc.h
#include sis_videostr.h
@@ -255,9 +253,6 @@ typedef struct {
int
(*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *);
} xSiSCtrlScreenTable;
-#ifdef X_XF86MiscPassMessage
-intSISHandleMessage(int scrnIndex, const char *msgtype, const char
*msgval, char **retmsg);
-#endif
void SiSCtrlExtInit(ScrnInfoPtr pScrn);
void SiSCtrlExtUnregister(SISPtr pSiS, int index);
@@ -853,19 +848,6 @@ SISGetMergedModeDetails(ScrnInfoPtr pScrn,
#endif
xserver-xorg-video-sis: Changes to 'upstream-experimental'
.cvsignore | 19 .gitignore | 20 configure.ac| 15 +++ man/.cvsignore |2 man/.gitignore |2 man/Makefile.am |1 src/.cvsignore |6 - src/.gitignore |6 + src/300vtbl.h |2 src/310vtbl.h |2 src/Makefile.am |1 src/init.c | 16 +-- src/init.h |2 src/init301.c |8 - src/init301.h |2 src/initdef.h |2 src/initextx.c |2 src/initextx.h |2 src/oem300.h|2 src/oem310.h|2 src/osdef.h |2 src/sis.h | 39 + src/sis300_accel.c |2 src/sis300_accel.h |2 src/sis310_accel.c |2 src/sis310_accel.h |2 src/sis6326_video.c |2 src/sis_accel.c |2 src/sis_accel.h |2 src/sis_common.h|2 src/sis_cursor.c|2 src/sis_cursor.h|2 src/sis_dac.c | 16 +-- src/sis_dac.h |2 src/sis_dga.c |2 src/sis_dri.c |6 - src/sis_dri.h |5 - src/sis_driver.c| 212 ++-- src/sis_driver.h|2 src/sis_opt.c |2 src/sis_regs.h |2 src/sis_setup.c | 189 ++ src/sis_shadow.c|2 src/sis_utility.c |2 src/sis_vb.c|2 src/sis_vga.c |7 + src/sis_video.c |2 src/sis_video.h |4 src/sis_videostr.h |2 src/sispcirename.h | 122 + src/vgatypes.h |2 src/vstruct.h |2 52 files changed, 545 insertions(+), 215 deletions(-) New commits: commit 70ccce405b2134e7548a4a3660f9cff9fc306780 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 15:31:27 2008 -0400 sis 0.10.0 diff --git a/configure.ac b/configure.ac index 471f676..796269a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-sis], -0.9.4, +0.10.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-sis) commit 3aff2a77c9c6bfff543195dc8908e422793a8f37 Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 15:29:30 2008 -0400 Fix distcheck diff --git a/src/Makefile.am b/src/Makefile.am index 281db15..8491d2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,6 +46,7 @@ sis_drv_la_SOURCES = \ sis310_accel.c \ sis310_accel.h \ sis6326_video.c \ +sispcirename.h \ sis_accel.c \ sis_accel.h \ sis_common.h \ commit be77b71c3614e5b926caf3a177f6d5b7ef8d528b Author: Adam Jackson [EMAIL PROTECTED] Date: Wed Mar 19 15:28:09 2008 -0400 Death to RCS tags. diff --git a/src/300vtbl.h b/src/300vtbl.h index e4b4a26..289e465 100644 --- a/src/300vtbl.h +++ b/src/300vtbl.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Register settings for SiS 300 series * diff --git a/src/310vtbl.h b/src/310vtbl.h index 20d6b63..290842d 100644 --- a/src/310vtbl.h +++ b/src/310vtbl.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Register settings for SiS 315/330/340 series * diff --git a/src/init.c b/src/init.c index f2b48a0..74df1f5 100644 --- a/src/init.c +++ b/src/init.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Mode initializing code (CRT1 section) for * for SiS 300/305/540/630/730, diff --git a/src/init.h b/src/init.h index 8f2ba67..bc90933 100644 --- a/src/init.h +++ b/src/init.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Data and prototypes for init.c * diff --git a/src/init301.c b/src/init301.c index 2eded9f..ffa6eaa 100644 --- a/src/init301.c +++ b/src/init301.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Mode initializing code (CRT2 section) * for SiS 300/305/540/630/730, diff --git a/src/init301.h b/src/init301.h index 60f8116..7dca546 100644 --- a/src/init301.h +++ b/src/init301.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Data and prototypes for init301.c * diff --git a/src/initdef.h b/src/initdef.h index 9dc9efe..62ec836 100644 --- a/src/initdef.h +++ b/src/initdef.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * Global definitions for init.c and init301.c * diff --git a/src/initextx.c b/src/initextx.c index 3c2b17e..5c00398 100644 --- a/src/initextx.c +++ b/src/initextx.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * X.org/XFree86 specific extensions to init.c/init301.c * diff --git a/src/initextx.h b/src/initextx.h index c4a5ded..fb00119 100644 --- a/src/initextx.h +++ b/src/initextx.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * X.org/XFree86 specific supplements to init.c/init301.c * diff --git a/src/oem300.h b/src/oem300.h index b73f268..906bc6f 100644 --- a/src/oem300.h +++ b/src/oem300.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ -/* $XdotOrg$ */ /* * OEM Data for
