xserver-xorg-video-savage: Changes to 'upstream-unstable'

[Andreas Boll <aboll-guest@moszumanska.debian.org>]

 configure.ac        |    2 +-
 src/compat-api.h    |    8 ++++++++
 src/savage_driver.c |    6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d0582b84231de1b089eda296cd3bb859e5df1acd
Author: Matt Turner <mattst88@gmail.com>
Date:   Tue Jan 17 14:44:13 2017 -0800

    xf86-video-savage 2.3.9
    
    Signed-off-by: Matt Turner <mattst88@gmail.com>

diff --git a/configure.ac b/configure.ac
index 7fe8293..5445972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-savage],
-        [2.3.8],
+        [2.3.9],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-savage])
 AC_CONFIG_SRCDIR([Makefile.am])

commit de3e1803314820968502156703d5bfe3fab24972
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>

diff --git a/src/compat-api.h b/src/compat-api.h
index 98ba435..44daea4 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -78,11 +78,19 @@
 
 #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
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
 #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
 
 #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
 #define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
 
 #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
 #define CLOSE_SCREEN_ARGS pScreen

commit de61497415e58a21fa247faf6db180ca47fb5df0
Author: Stefan Dirsch <sndirsch@suse.de>
Date:   Wed Apr 27 16:02:13 2016 +0200

    Disable tiling on SuperSavage by default
    
    Xserver cannot be started with Tiling enabled on SuperSavage.
    https://bugzilla.opensuse.org/show_bug.cgi?id=805380
    
    Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
    Acked-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/src/savage_driver.c b/src/savage_driver.c
index d278345..58a294d 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1668,7 +1668,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
 #endif
 
     /* we can use Option "DisableTile TRUE" to disable tile mode */
-    psav->bDisableTile = FALSE; 
+    if (psav->Chipset == S3_SUPERSAVAGE)
+        /* apparently broken with these GPUs, see https://bugzilla.opensuse.org/show_bug.cgi?id=805380 */
+	psav->bDisableTile = TRUE;
+    else
+	psav->bDisableTile = FALSE;
     if (xf86GetOptValBool(psav->Options, OPTION_DISABLE_TILE,&psav->bDisableTile)) {
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
                    "Option: %s Tile Mode and Program it \n",(psav->bDisableTile?"Disable":"Enable"));