xserver-xorg-video-sis: Changes to 'debian-experimental'
.gitignore | 78 ++++++++++
ChangeLog | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 71 +++++----
debian/changelog | 7
debian/control | 2
debian/patches/series | 1
man/Makefile.am | 34 ----
man/sis.man | 20 --
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 | 355 +++++++++++++++++++++++++++---------------------
src/sis_driver.h | 22 +-
src/sis_memcpy.c | 12 -
src/sis_opt.c | 16 +-
src/sis_shadow.c | 22 +-
src/sis_utility.c | 64 ++++----
src/sis_vga.c | 13 +
src/sis_video.c | 20 +-
src/sispcirename.h | 29 +++
src/vgatypes.h | 12 -
33 files changed, 1067 insertions(+), 429 deletions(-)
New commits:
commit 3989f6a1b3a248a626f3b7b2aab456ec9eebdf2c
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:14:28 2012 +0200
Bump Standards-Version to 3.9.3
diff --git a/debian/changelog b/debian/changelog
index 9512097..d8feb82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-sis (1:0.10.7-1) UNRELEASED; urgency=low
* New upstream release
+ * Bump Standards-Version to 3.9.3
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:11:59 +0200
diff --git a/debian/control b/debian/control
index b0dc10d..2264fdb 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+1),
-Standards-Version: 3.9.0
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sis
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sis.git
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
commit a382c48dc7d3027888576b9d06a896a184087b91
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:12:31 2012 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 45b97f7..9512097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sis (1:0.10.7-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 15:11:59 +0200
+
xserver-xorg-video-sis (1:0.10.3-2) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit 5961a69692a8f174e7eacd64c78ca8d8b381b37a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:11:50 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index ecb8dfc..a83ca27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,371 @@
+commit 8c5127a6815935635b84835055bf4c2501c0bf6e
+Author: Dave Airlie <airlied@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 <airlied@redhat.com>
+
+commit c3d8d70edd06b8ecedd341df8b33ba71c01e64b3
+Author: Dave Airlie <airlied@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 <airlied@redhat.com>
+
+commit 314d56d0addfaa5c24d14de675416b3aca7f4a19
+Author: Alan Coopersmith <alan.coopersmith@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.coopersmith@oracle.com>
+
+commit aa79b0f5dbbeda194916365539d06c3c090b80d2
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 2 13:19:04 2012 +0100
+
+ sis 0.10.6 release.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit df17d3039e856c13b0476122a01b8c20f7d2de88
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 2 13:16:26 2012 +0100
+
+ sis: fix build against older servers.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 331c276b47af1140a64125bff39901f8a8271eb7
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 2 13:13:42 2012 +0100
+
+ sis: 0.10.5 release
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit f6d49466ca538c65fa8c66352e421c2624e204f1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jun 6 09:50:31 2012 +0100
+
+ sis: drop xf86PciInfo.h
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 1b20cd63a974f792bd15e13d1c6caa3bbabbe106
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jun 6 09:46:42 2012 +0100
+
+ sis: port to new compat API.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit e067fc080c653a5d47cd319ca1a7afeebe6c7c4e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 23 19:52:38 2012 -0700
+
+ xf86-video-sis 0.10.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f5dafa24d825a7d279c8177422c66b997b82d240
+Author: Johannes Obermayr <johannesobermayr@gmx.de>
+Date: Mon Feb 6 23:15:31 2012 +0100
+
+ Fix build with XInput version 12.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bdaf1ba97cf8b0abb5aeee97a822ee466bf8f5f5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Jan 17 15:21:26 2012 +1000
+
+ Undo typos from last commit
+
+ Reported-by: Tormod Volden <debian.tormod@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9c1f8f775ca692858fd88e325ef815cc49e55805
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jan 4 13:58:01 2012 +1000
+
+ Untangle XF86DRI from the driver-specific DRI define
+
+ XF86DRI is defined by xorg-server.h, so --disable-dri in the sis driver
+ itself does exactly nothing other than not fill in the CFLAGS and thus stop
+ the driver from compiling.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 16724f3ecd322c64d9ee164fb122d4285d9cef08
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 31 15:03:21 2011 +1000
+
+ Use miPointerSetPosition, not miPointerAbsoluteCursor
+
+ miPointerAbsoluteCursor was removed in '09.
+
+ Technically this shouldn't just work on the VCP since any master pointer may
+ end up in the dead area. However, I suspect the Venn diagramm of MPX users
+ and sis merged framebuffer users shows little overlap.
+
+ miPointerSetPosition's prototype changed a few times, these are a bunch of
+ untested ifdefs that should be correct according to the git history.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3e0d8e11927b8c68f6531eef39eb5bca557e887b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:28:33 2011 -0500
+
+ Fall back to shadowfb if XAA is unavailable
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2b459f385dc2f1b5e769e2ce84b6f4ec099c0a23
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Oct 31 11:57:49 2011 -0700
+
+ Build fix for older servers (error: conflicting types for 'pciTag')
+
+ /usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
+
+ Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 0ab07a477a4916923a13c073c3fd6e575e79f725
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 30 11:09:30 2011 -0700
+
+ Use pci_device_map_legacy rather than xf86MapDomainMemory on newer servers
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 77046f9be08295dbca69b51987df3308a284d87e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 29 17:44:55 2011 -0700
+
+ Convert use of LookupWindow to dixLookupWindow
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 06f8213bffd27360d5cc3df0cad19b102cc928e2
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 29 17:32:21 2011 -0700
+
+ pciTag was removed from xorg-server, so provide it in-driver until this is updated to use libpciaccess
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 03644653d051e4f5b8498c790626a9bed2756a89
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 29 17:25:18 2011 -0700
+
+ Silence warnings by using newer xf86dgaproto
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4b0aab53a1e8500578f86178761f4c805b2a5990
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:40:32 2011 -0700
+
+ Build fix for ABI Version 12
+
+ ABI Version 12 removes support for multiple PCI domains. If you need to
+ use this driver on a system with more than one PCI domain, you should
+ either port this driver to using libpciaccess directly or stick with an
+ older server.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 69aa104ed064ca08196e7310e232ddb5c9a590bd
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Oct 19 00:35:02 2011 -0700
+
+ Use unsigned long rather than deprecated IOADDRESS
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 28f3a899a1e317b665cc1925ce7a4e34818cfd1f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 7 12:32:22 2011 -0700
+
+ Use malloc/calloc/realloc/free directly
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c530ebb5d4ad0663838a0132e3610d713eaaa640
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 7 12:24:40 2011 -0700
+
+ Fix build failures with recent server changes to swapl and swaps
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 89e9a38f0ccda9b9ee973f5cd5e57cad73eb7421
+Author: Matt Turner <mattst88@gmail.com>
+Date: Sun Sep 25 12:32:08 2011 -0400
+
+ Fix wrong-sized swaps
+
+ Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 94f23a5672ebeac61cc32e34882d637aa0c7f2f4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Jun 4 21:00:03 2011 -0700
+
+ Convert sis.man from XORG_RAWCPP to using sed like other drivers
+
+ 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.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b3368984ae83355d70e06eedefff28c1b84eb16c
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:29:51 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c2a6ffda81b343d09dfae6ef68983bf28194a00c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit ae7ac7fe58a1311544b9d0091614a61d29eef171
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit fe34acc246e938bd190af11a0361a2541fcc590c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4d77c76f9c94804efd942328722fb1262df74f5a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2a3e9ff44670c0763557ce9c87b9946bd4349027
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 00d2b8790a0aa732d0abb4688330749a1c44763d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:54:12 2010 -0400
+
+ config: remove unrequired AC_SUBST([DRI_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ca0dd9ac3d78991f20e19e9b1cbb06b8707698bd
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 96daa64b9ce5a44474fa0c62c5cc5971496120ee
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 517a7563c43841ecb1cb00577540118f93856df8
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 494ce36b3bf1cfffb12c70ea969381766b46e622
+Author: Gaetan Nadon <memsize@videotron.ca>
+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 <memsize@videotron.ca>
+
+commit 519a4653ffdd5b643b6f3c0f38eb2cad8366215b
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:16:18 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 75a8a7c51547805358ced39e1a04820e17133264
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:23:33 2010 +1000
commit 468e361fd630c5431b32e7bdb5d8ae38a94c8f63
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 15:11:38 2012 +0200
Recover missing .gitignore from upstream
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..01f9d5e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,78 @@
+#
+# 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/
+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
+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 8c5127a6815935635b84835055bf4c2501c0bf6e
Author: Dave Airlie <airlied@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 <airlied@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 <airlied@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 <airlied@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.coopersmith@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.coopersmith@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, pSiS->RelIO + 0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_UnLockCRT2(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
@@ -990,7 +990,7 @@ SiS301Restore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
Part4max = 0x1b;
SiSRegInit(pSiS->SiS_Pr, pSiS->RelIO + 0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
SiS_UnLockCRT2(pSiS->SiS_Pr);
@@ -1084,7 +1084,7 @@ SiS301BRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
} /* TODO for 307 */
SiSRegInit(pSiS->SiS_Pr, pSiS->RelIO + 0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
SiS_UnLockCRT2(pSiS->SiS_Pr);
@@ -1193,7 +1193,7 @@ SiSLVDSChrontelRestore(ScrnInfoPtr pScrn, SISRegPtr sisReg)
int i;
SiSRegInit(pSiS->SiS_Pr, pSiS->RelIO + 0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
if(pSiS->ChipType == SIS_730) {
diff --git a/src/sis_dac.h b/src/sis_dac.h
index b270675..18d956d 100644
--- a/src/sis_dac.h
+++ b/src/sis_dac.h
@@ -72,7 +72,7 @@ extern void SiS_DisplayOn(struct SiS_Private *SiS_Pr);
extern unsigned char SiS_GetSetModeID(ScrnInfoPtr pScrn, unsigned char id);
extern void SiS_SetEnableDstn(struct SiS_Private *SiS_Pr, int enable);
extern void SiS_SetEnableFstn(struct SiS_Private *SiS_Pr, int enable);
-extern void SiSRegInit(struct SiS_Private *SiS_Pr, unsigned short BaseAddr);
-extern void SiSSetLVDSetc(struct SiS_Private *SiS_Pr, unsigned short ModeNo);
+extern void SiSRegInit(struct SiS_Private *SiS_Pr, SISIOADDRESS BaseAddr);
+extern void SiSSetLVDSetc(struct SiS_Private *SiS_Pr);
extern void SiS_GetVBType(struct SiS_Private *SiS_Pr);
/* End of init.c/init301.c imports */
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 9df696d..61e8075 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -7413,7 +7413,7 @@ SISSave(ScrnInfoPtr pScrn)
#ifdef SIS_PC_PLATFORM
if(pSiS->VGAMemBase) {
SiSRegInit(pSiS->SiS_Pr, pSiS->RelIO+0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
SiSVGASave(pScrn, sisReg, SISVGA_SR_FONTS);
@@ -8089,7 +8089,7 @@ SISRestore(ScrnInfoPtr pScrn)
if(flags & SISVGA_SR_FONTS) {
SiSRegInit(pSiS->SiS_Pr, pSiS->RelIO+0x30);
- SiSSetLVDSetc(pSiS->SiS_Pr, 0);
+ SiSSetLVDSetc(pSiS->SiS_Pr);
SiS_GetVBType(pSiS->SiS_Pr);
SiS_DisableBridge(pSiS->SiS_Pr);
SiSVGAProtect(pScrn, TRUE);
commit aa79b0f5dbbeda194916365539d06c3c090b80d2
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 13:19:04 2012 +0100
sis 0.10.6 release.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 4599691..67994b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sis],
- [0.10.5],
+ [0.10.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sis])
AC_CONFIG_SRCDIR([Makefile.am])
commit df17d3039e856c13b0476122a01b8c20f7d2de88
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 13:16:26 2012 +0100
sis: fix build against older servers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 5fbf76c..9df696d 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -9669,7 +9669,7 @@ SISAdjustFrame(ADJUST_FRAME_ARGS_DECL)
#ifdef SISMERGED
if(pSiS->MergedFB) {
- SISAdjustFrameMerged(ADJUST_FRAME_ARGS(arg, x, y));
+ SISAdjustFrameMerged(ADJUST_FRAME_ARGS(pScrn, x, y));
return;
}
#endif
commit 331c276b47af1140a64125bff39901f8a8271eb7
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 13:13:42 2012 +0100
sis: 0.10.5 release
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index ab40a65..4599691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sis],
- [0.10.4],
+ [0.10.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-sis])
AC_CONFIG_SRCDIR([Makefile.am])
commit f6d49466ca538c65fa8c66352e421c2624e204f1
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 6 09:50:31 2012 +0100
sis: drop xf86PciInfo.h
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/sis.h b/src/sis.h
index 1fbedf1..5ea3eba 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -81,7 +81,6 @@
#include "xf86Resources.h"
#endif
#include "xf86.h"
-#include "xf86PciInfo.h"
#include "xf86Cursor.h"
#include "xf86cmap.h"
#include "vbe.h"
@@ -305,6 +304,41 @@
#define SISVERBLEVEL 4
#endif
+#ifndef _XF86_PCIINFO_H
+#define PCI_VENDOR_SIS 0x1039
+/* SiS */
+#define PCI_CHIP_SG86C201 0x0001
+#define PCI_CHIP_SG86C202 0x0002
+#define PCI_CHIP_SG85C503 0x0008
+#define PCI_CHIP_SIS5597 0x0200
+/* Agregado por Carlos Duclos & Manuel Jander */
+#define PCI_CHIP_SIS82C204 0x0204
+#define PCI_CHIP_SG86C205 0x0205
+#define PCI_CHIP_SG86C215 0x0215
+#define PCI_CHIP_SG86C225 0x0225
+#define PCI_CHIP_85C501 0x0406
+#define PCI_CHIP_85C496 0x0496
+#define PCI_CHIP_85C601 0x0601
+#define PCI_CHIP_85C5107 0x5107
+#define PCI_CHIP_85C5511 0x5511
+#define PCI_CHIP_85C5513 0x5513
+#define PCI_CHIP_SIS5571 0x5571
+#define PCI_CHIP_SIS5597_2 0x5597
+#define PCI_CHIP_SIS530 0x6306
+#define PCI_CHIP_SIS6326 0x6326
+#define PCI_CHIP_SIS7001 0x7001
+#define PCI_CHIP_SIS300 0x0300
+#define PCI_CHIP_SIS315H 0x0310
+#define PCI_CHIP_SIS315PRO 0x0325
+#define PCI_CHIP_SIS330 0x0330
+#define PCI_CHIP_SIS630 0x6300
+#define PCI_CHIP_SIS540 0x5300
+#define PCI_CHIP_SIS550 0x5315
+#define PCI_CHIP_SIS650 0x6325
+#define PCI_CHIP_SIS730 0x7300
+
+#endif
+
/* For SiS315/550/650/740/330/660 - these should be moved elsewhere! */
#ifndef PCI_CHIP_SIS315H
#define PCI_CHIP_SIS315H 0x0310
commit 1b20cd63a974f792bd15e13d1c6caa3bbabbe106
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 6 09:46:42 2012 +0100
sis: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 8491d2d..52523a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@ sis_drv_ladir = @moduledir@/drivers
sis_drv_la_SOURCES = \
300vtbl.h \
310vtbl.h \
+ compat-api.h \
init301.c \
init301.h \
init.c \
diff --git a/src/compat-api.h b/src/compat-api.h
new file mode 100644
index 0000000..6bc946f
--- /dev/null
+++ b/src/compat-api.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * 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.
+ *
+ * Author: Dave Airlie <airlied@redhat.com>
+ */
+
+/* this file provides API compat between server post 1.13 and pre it,
+ it should be reused inside as many drivers as possible */
+#ifndef COMPAT_API_H
+#define COMPAT_API_H
+
+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
+#endif
+
+#ifndef XF86_HAS_SCRN_CONV
+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
+#endif
+
+#ifndef XF86_SCRN_INTERFACE
+
+#define SCRN_ARG_TYPE int
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
+
+#define SCREEN_ARG_TYPE int
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
+
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
+
+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
+
+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
+
+#define FREE_SCREEN_ARGS_DECL int arg, int flags
+
+#define VT_FUNC_ARGS_DECL int arg, int flags
+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
+
+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
+#else
+#define SCRN_ARG_TYPE ScrnInfoPtr
+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
+
+#define SCREEN_ARG_TYPE ScreenPtr
+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
+
+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+
+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
+#define CLOSE_SCREEN_ARGS pScreen
+
+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
+
+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
+#define SWITCH_MODE_ARGS(arg, m) arg, m
+
Reply to: