8 files changed, 448 insertions, 74 deletions
diff --git a/driver/xf86-video-sis/ChangeLog b/driver/xf86-video-sis/ChangeLog
index a0e3cc311..15c93d6c9 100644
--- a/driver/xf86-video-sis/ChangeLog
+++ b/driver/xf86-video-sis/ChangeLog
@@ -1,3 +1,29 @@
+commit 3b1aca65448a0660d8ecb60b2431a306b66d5a5a
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Tue Jan 17 14:45:31 2017 -0800
+
+    xf86-video-sis 0.10.9
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 96fee560cd8bf7bf27048ce5fe67b7af6838c8d0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Jul 19 10:03:56 2016 -0400
+
+    Adapt Block/WakeupHandler signature for ABI 23
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 328073e46f9b9fcc09e637c94496c90273a0a4f6
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date:   Sun Sep 13 23:28:53 2015 +0200
+
+    Fix arguments for miSetPointerPosition.
+    
+    For the call for the API between versions 5 and 15.
+    
+    Reviewed-by: Connor Behan <connor.behan@gmail.com>
+
 commit 13b56dc68af8cc41f4fd44115302a3ebbe6662a1
 Author: Matt Turner <mattst88@gmail.com>
 Date:   Sat Aug 29 16:35:43 2015 -0700
diff --git a/driver/xf86-video-sis/Makefile.in b/driver/xf86-video-sis/Makefile.in
index 6c432119a..4b169d002 100644
--- a/driver/xf86-video-sis/Makefile.in
+++ b/driver/xf86-video-sis/Makefile.in
@@ -72,8 +72,8 @@ host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
+	$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/driver/xf86-video-sis/README b/driver/xf86-video-sis/README
index 6e26ad8d5..426bdcced 100644
--- a/driver/xf86-video-sis/README
+++ b/driver/xf86-video-sis/README
@@ -1,5 +1,5 @@
   Information for SiS and XGI Users
-  Thomas Winischhofer  <thomas@winischhofer.net>
+  Thomas Winischhofer (thomas@winischhofer.net)
   6 July 2005
   ____________________________________________________________
 
@@ -17,7 +17,7 @@
 
   ______________________________________________________________________
 
-  [1m1.  Introduction[0m
+  1.  Introduction
 
 
   This driver is written by Thomas Winischhofer and is a (nearly)
@@ -26,45 +26,45 @@
 
   It currently supports the following chipsets:
 
-  +o  old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
+  o  old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
 
-  +o  300 series: SiS 300/305, 540, 630/730
+  o  300 series: SiS 300/305, 540, 630/730
 
-  +o  315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740,
+  o  315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740,
      [M]661&[F/M/G]X, [M]741[GX]
 
-  +o  330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX]
+  o  330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX]
 
-  +o  340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
+  o  340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
 
   Among other features, the driver supports
 
-  +o  8/16/24 bits color depth; old series also 15
+  o  8/16/24 bits color depth; old series also 15
 
-  +o  Hardware cursor; 315/330/340 series: Color HW cursor
+  o  Hardware cursor; 315/330/340 series: Color HW cursor
 
-  +o  XAA; EXA; XVideo (Xv); RENDER and other extensions
+  o  XAA; EXA; XVideo (Xv); RENDER and other extensions
 
-  +o  6326: TV output
+  o  6326: TV output
 
-  +o  300/315/330/340 series: TV output via Chrontel TV encoders or SiS
+  o  300/315/330/340 series: TV output via Chrontel TV encoders or SiS
      video bridges
 
-  +o  300/315/330/340 series: LCD output via LVDS transmitters or SiS
+  o  300/315/330/340 series: LCD output via LVDS transmitters or SiS
      video bridges
 
-  +o  300/315/330/340 series: Dual head mode; Xinerama; Merged
+  o  300/315/330/340 series: Dual head mode; Xinerama; Merged
      framebuffer mode
 
-  +o  300/315/330/340 series: Interface for SiSCtrl (see below)
+  o  300/315/330/340 series: Interface for SiSCtrl (see below)
 
   This document provides a brief overview over the driver's features and
   configuration options. Please see
-  http://www.winischhofer.at/linuxsisvga.shtml for detailed
+  http://www.winischhofer.eu/linuxsisvga.shtml for detailed
   documentation and updates.
 
 
-  [1m2.  xorg.conf Options[0m
+  2.  xorg.conf Options
 
 
   The following options are of particular interest for the SiS driver.
@@ -76,72 +76,72 @@
   "false" and "no" respectively have the same meaning.
 
 
-  [1m2.1.  For all chipsets[0m
+  2.1.  For all chipsets
 
 
 
-     [1mOption[0m
+     Option
         >
 
-     [1mOption[0m
+     Option
         These options select whether the software (SW) or hardware (HW)
         cursor should be used. The default is using the hardware cursor.
 
-     [1mOption[0m
+     Option
         Disables 2D acceleration. By default, 2D acceleration is
         enabled.
 
-     [1mOption[0m
+     Option
         Determines which acceleration architecture should be used.
         Possible arguments are "XAA" or "EXA". As of this writing, EXA
         is still experimental and it is not recommended to be used on
         production machines. By default, XAA will be used.
 
-     [1mOption[0m
+     Option
         This option enables clockwise ("CW") or counter-clockwise
         ("CCW") rotation of the display. Enabling either CW or CCW
         rotation disables the RandR extension as well as all 2D
         acceleration and Xv support. Default: no rotation.
 
-     [1mOption[0m
+     Option
         This option enables reflecting the display horizontally ("X"),
         vertically ("Y") or in both directions ("XY"). Enabling
         reflection disables the RandR extension as well as all 2D
         acceleration and Xv support. Default: no rotation.
 
-     [1mOption[0m
+     Option
         This option enables the shadow framebuffer layer. By default, it
         is disabled.
 
-     [1mOption[0m
+     Option
         Disables the XVideo (Xv) support. Apart from the XGI Volari Z7,
         all chipsets support Xv. By default, XVideo support is enabled.
 
-     [1mOption[0m
+     Option
         Enables or disables gamma correction. Default: gamma correction
         is enabled.
 
 
-  [1m2.2.  Old series specific options[0m
+  2.2.  Old series specific options
 
 
 
-     [1mOption[0m
+     Option
         Enables 1 cycle memory access for read and write operations. The
         default depends on the chipset used.
 
-     [1mOption[0m
+     Option
         SiS chipsets have the ability to extend the engine command queue
         in video RAM. This concept is called "TurboQueue" and gives some
         performance improvement. Due to hardware bugs, the TurboQueue is
         disabled on the 530/620, otherwise enabled by default.
 
-     [1mOption[0m
+     Option
         For 5597/5598 only. This option, if set, disables the CPU to VGA
         host bus.  Disabling the host bus will result in a severe
         performance regression.
 
-     [1mVideoRAM [size][0m
+     VideoRAM [size]
         The SiS 6326 can only directly address 4096K bytes of video RAM.
         However, there are some cards out there featuring 8192K (8MB) of
         video RAM. This RAM is not addressable by the engines.
@@ -152,41 +152,41 @@
         all other chipsets, this keyword is ignored. The size argument
         is expected in KB, but without "KB".
 
-     [1mOption[0m
+     Option
         Due to hardware bugs, XVideo may display a corrupt image when
         using YV12 encoded material. This option, if set, disables
         support for YV12 and hence forces the Xv-aware application to
         use either YUV2 or XShm for video output.
 
-     [1mOption[0m
+     Option
         (6326 only) Selects the TV output standard. May be PAL or NTSC.
         By default, this is selected by a jumper on the card.
 
 
-  [1m2.3.  300/315/330/340 series specific options[0m
+  2.3.  300/315/330/340 series specific options
 
 
 
-     [1mOption[0m
+     Option
         This option enables/disables the driver's interface for the
         SiSCtrl utility. Please see
-        http://www.winischhofer.at/linuxsisvga.shtml for more
+        http://www.winischhofer.eu/linuxsisvga.shtml for more
         information.
 
-     [1mOption[0m
+     Option
         (300 series only) SiS chipsets have the ability to extend the
         engine command queue in video RAM. This concept is called
         "TurboQueue" and gives some performance improvement. The
         TurboQueue is enabled by default.
 
-     [1mOption[0m
+     Option
         Enables or disables CRT1 (= the external VGA monitor). By
         default, the driver will use CRT1 if a monitor is detected
         during server start. Some older monitors can't be detected, so
         they may require setting this option to true. To disable CRT1
         output, set this option to false.
 
-     [1mOption[0m
+     Option
         (For SiS 650, M650, 651, 661, 741, 760 with either SiS 301LV,
         302LV or SiS 301C video bridge only) The argument may be "VGA",
         "LCD" or "OFF".  Specifying LCD will force the driver to use the
@@ -194,7 +194,7 @@
         free for TV usage. "OFF" is the same as setting the option
         ForceCRT1 to "false". Default is VGA.
 
-     [1mOption[0m
+     Option
         Selects the CRT2 output device type. Valid parameters are "LCD",
         "TV", "SVIDEO", "COMPOSITE", "SVIDEO+COMPOSITE", "SCART", "VGA",
         "YPBPR480I", "YPBPR480P", "YPBPR720P", "YPBPR1080I" or "NONE".
@@ -205,53 +205,53 @@
         secondary VGA and is only available on some SiS video bridges
         (301, 301B, 301C).
 
-     [1mOption[0m
+     Option
         (For SiS video bridges only) This option enables or disables
         gamma correction for CRT2. Default: gamma correction for CRT2 is
         enabled.
 
-     [1mOption[0m
+     Option
         Although this option is accepted for all chipsets, it currently
         only makes sense on the 300 series; DRI is only supported on
         these chipsets.  This option enables/disables DRI.
 
-     [1mOption[0m
+     Option
         Selects the TV output standard. May be PAL or NTSC, on some
         machines (depending on the hardware) also PALM and PALN.
         Default: BIOS setting.
 
-     [1mOption[0m
+     Option
         >
 
-     [1mOption[0m
+     Option
         These options allow relocating the image on your TV. Both
         options take an integer within the range of -16 to 16. Default:
         0. Not supported for Chrontel 7019.
 
-     [1mOption[0m
+     Option
         (For Chrontel TV encoders only) Selects whether TV output should
         be overscan or underscan.
 
-     [1mOption[0m
+     Option
         (For Chrontel 7005 TV encoders in PAL mode only) Selects whether
         TV output should be super-overscan (slightly larger than the
         viewable area) or not.
 
-     [1mOption[0m
+     Option
         >
 
-     [1mOption[0m
+     Option
         (For SiS video bridges only) These options allow zooming the
         image on your TV. SISTVXScale takes an integer within the range
         of -16 to 16.  SISTVYScale accepts -4 to 3. Default: 0. Not all
         modes can be scaled.
 
 
-  [1m2.4.  300 series specific options[0m
+  2.4.  300 series specific options
 
 
 
-     [1mOption[0m
+     Option
         This option might only be needed if you are running X on a Linux
         2.4 series kernel. This option is not needed and should be
         omitted on Linux 2.6 and *BSD.
@@ -291,17 +291,17 @@
         total video memory in the BIOS setup utility to 64MB.
 
 
-  [1m2.5.  315/330/340 series specific options[0m
+  2.5.  315/330/340 series specific options
 
 
 
-     [1mOption[0m
+     Option
         Enables or disables RENDER acceleration. This feature, for
         instance, accelerates output of anti-aliased text. By default,
         RENDER acceleration is enabled. RENDER acceleration is currently
         only supported for XAA, not EXA.
 
-     [1mOption[0m
+     Option
         (For 315, 650, 740, 330, 340 and XGI chips only) This option
         selects whether the XVideo (Xv) overlay should be displayed on
         CRT1 or CRT2. Setting this option means CRT2. The other CRT will
diff --git a/driver/xf86-video-sis/compile b/driver/xf86-video-sis/compile
new file mode 100644
index 000000000..a85b723c7
--- /dev/null
+++ b/driver/xf86-video-sis/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/driver/xf86-video-sis/configure b/driver/xf86-video-sis/configure
index 4fb36eabb..857249728 100644
--- a/driver/xf86-video-sis/configure
+++ b/driver/xf86-video-sis/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-sis 0.10.8.
+# Generated by GNU Autoconf 2.69 for xf86-video-sis 0.10.9.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-video-sis'
 PACKAGE_TARNAME='xf86-video-sis'
-PACKAGE_VERSION='0.10.8'
-PACKAGE_STRING='xf86-video-sis 0.10.8'
+PACKAGE_VERSION='0.10.9'
+PACKAGE_STRING='xf86-video-sis 0.10.9'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-sis 0.10.8 to adapt to many kinds of systems.
+\`configure' configures xf86-video-sis 0.10.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1441,7 +1441,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-sis 0.10.8:";;
+     short | recursive ) echo "Configuration of xf86-video-sis 0.10.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1576,7 +1576,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-sis configure 0.10.8
+xf86-video-sis configure 0.10.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1991,7 +1991,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-sis $as_me 0.10.8, which was
+It was created by xf86-video-sis $as_me 0.10.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2820,7 +2820,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-sis'
- VERSION='0.10.8'
+ VERSION='0.10.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -19036,7 +19036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-sis $as_me 0.10.8, which was
+This file was extended by xf86-video-sis $as_me 0.10.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19102,7 +19102,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xf86-video-sis config.status 0.10.8
+xf86-video-sis config.status 0.10.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/driver/xf86-video-sis/configure.ac b/driver/xf86-video-sis/configure.ac
index 43049d36c..add866127 100644
--- a/driver/xf86-video-sis/configure.ac
+++ b/driver/xf86-video-sis/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-sis],
-        [0.10.8],
+        [0.10.9],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-sis])
 AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/driver/xf86-video-sis/src/compat-api.h b/driver/xf86-video-sis/src/compat-api.h
index 6bc946fd6..89976e41c 100644
--- a/driver/xf86-video-sis/src/compat-api.h
+++ b/driver/xf86-video-sis/src/compat-api.h
@@ -75,8 +75,13 @@
 
 #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#else
 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
+#endif
 
 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
 #define CLOSE_SCREEN_ARGS pScreen
diff --git a/driver/xf86-video-sis/src/sis_driver.c b/driver/xf86-video-sis/src/sis_driver.c
index 9e2ffaf94..8f0616437 100644
--- a/driver/xf86-video-sis/src/sis_driver.c
+++ b/driver/xf86-video-sis/src/sis_driver.c
@@ -9390,18 +9390,14 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
         {
             double dx = x, dy = y;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 19
-            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, 0, NULL);
-#else
             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
-#endif
             x = (int)dx;
             y = (int)dy;
         }
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
-	miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+	miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
-	miPointerSetPosition(inputInfo.pointer, x, y);
+	miPointerSetPosition(inputInfo.pointer, &x, &y);
 #else
 	UpdateCurrentTime();
 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);