qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xf86-video-savage 2.3.9

Browse Source
This commit is contained in:
matthieu 2017-02-18 18:05:37 +00:00
parent 4926f94ad6
commit 8fe54088b8
6 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
driver/xf86-video-savage/ChangeLog
View File

@ -1,3 +1,31 @@
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>
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>
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>
commit f8f24e6856e2627f6620a8fd0474366d057496d2 commit f8f24e6856e2627f6620a8fd0474366d057496d2
Author: Julien Cristau <jcristau@debian.org> Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 8 12:08:50 2015 +0200 Date: Fri May 8 12:08:50 2015 +0200

2
driver/xf86-video-savage/compile
View File

@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify

20
driver/xf86-video-savage/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xf86-video-savage 2.3.8. # Generated by GNU Autoconf 2.69 for xf86-video-savage 2.3.9.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
# #
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='xf86-video-savage' PACKAGE_NAME='xf86-video-savage'
PACKAGE_TARNAME='xf86-video-savage' PACKAGE_TARNAME='xf86-video-savage'
PACKAGE_VERSION='2.3.8' PACKAGE_VERSION='2.3.9'
PACKAGE_STRING='xf86-video-savage 2.3.8' PACKAGE_STRING='xf86-video-savage 2.3.9'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL='' 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. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures xf86-video-savage 2.3.8 to adapt to many kinds of systems. \`configure' configures xf86-video-savage 2.3.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1442,7 +1442,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of xf86-video-savage 2.3.8:";; short | recursive ) echo "Configuration of xf86-video-savage 2.3.9:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1577,7 +1577,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
xf86-video-savage configure 2.3.8 xf86-video-savage configure 2.3.9
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -1992,7 +1992,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by xf86-video-savage $as_me 2.3.8, which was It was created by xf86-video-savage $as_me 2.3.9, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -2821,7 +2821,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='xf86-video-savage' PACKAGE='xf86-video-savage'
VERSION='2.3.8' VERSION='2.3.9'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -19005,7 +19005,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by xf86-video-savage $as_me 2.3.8, which was This file was extended by xf86-video-savage $as_me 2.3.9, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -19071,7 +19071,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
xf86-video-savage config.status 2.3.8 xf86-video-savage config.status 2.3.9
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
driver/xf86-video-savage/configure.ac
View File

@ -23,7 +23,7 @@
# Initialize Autoconf # Initialize Autoconf
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([xf86-video-savage], AC_INIT([xf86-video-savage],
[2.3.8], [2.3.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-savage]) [xf86-video-savage])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])

8
driver/xf86-video-savage/src/compat-api.h
View File

@ -78,11 +78,19 @@
#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv #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_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, result, read_mask #define WAKEUPHANDLER_ARGS arg, result, read_mask
#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen #define CLOSE_SCREEN_ARGS pScreen

6
driver/xf86-video-savage/src/savage_driver.c
View File

@ -1669,7 +1669,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
#endif #endif
/* we can use Option "DisableTile TRUE" to disable tile mode */ /* 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)) { if (xf86GetOptValBool(psav->Options, OPTION_DISABLE_TILE,&psav->bDisableTile)) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Option: %s Tile Mode and Program it \n",(psav->bDisableTile?"Disable":"Enable")); "Option: %s Tile Mode and Program it \n",(psav->bDisableTile?"Disable":"Enable"));