xserver-xorg-video-savage: Changes to 'debian-unstable'
.cvsignore | 19 --
ChangeLog | 96 +++++++++++
Makefile.in | 2
config.guess | 6
config.sub | 10 -
configure | 256 ++++++++++++++++++++++++++++---
configure.ac | 12 +
debian/changelog | 7
debian/control | 2
man/.cvsignore | 2
man/Makefile.in | 2
src/.cvsignore | 6
src/Makefile.in | 2
src/savage_dga.c | 2
src/savage_dri.c | 14 +
src/savage_driver.c | 418 +++++++++++++++++++++++++++++++++++++++-------------
src/savage_driver.h | 33 +++-
src/savage_hwmc.c | 2
18 files changed, 711 insertions(+), 180 deletions(-)
New commits:
commit 3c49eb8964ba5fbc2b0d222014d1109b6fd0204a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 15:24:18 2007 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 3e91567..d90e43b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xserver-xorg-video-savage (1:2.1.3-4) UNRELEASED; urgency=low
+xserver-xorg-video-savage (1:2.1.3-4) unstable; urgency=low
* Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2
+ Fix crash in SavageSwitchMode(), closes: #440839.
* Add upstream URL to debian/copyright.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 15:17:43 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 15:23:29 +0100
xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7114062..0be9597 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-savage
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage
commit ecad3bde4dade36a85d59f991aed6d893a0cf440
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 15:21:51 2007 +0100
Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 2df4a8d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-*~
diff --git a/ChangeLog b/ChangeLog
index bd4b1b9..871f56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+commit 9c959f53ca8376aa136a9d434c3383cdb20487c2
+Author: Alex Deucher <alex@botch2.(none)>
+Date: Fri Sep 14 20:21:12 2007 -0400
+
+ fix the build for the non-pci-rework case (compile tested only)
+
+commit 846a69f70d189c486448df269a512b8d42fab0c2
+Author: Alex Deucher <alex@botch2.(none)>
+Date: Fri Sep 14 20:13:33 2007 -0400
+
+ fix segfault from pScrn->currentMode
+
+ should fix bug 12260
+
+commit 53a2088c5590bb96ce9a7ad30d908c7ea1d54027
+Merge: 7da1a03... 0287432...
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 06:08:13 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-savage
+
+commit 7da1a03d4b8b40483001b1f6e56dae655a1797f4
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:43 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 0287432c65231460fadff7d8d7b332208e345a31
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Fri Aug 31 13:07:17 2007 -0700
+
+ Fix odd typo.
+
+commit 514dc647d108e179965adb1377b1d4c011afa367
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Thu Aug 30 17:53:11 2007 -0700
+
+ Update to use new libpciaccess interfaces for mapping with MTRR support.
+
+commit 1eec792391d9ce9127817107100a53382f167749
+Merge: 4a87cab... ffc5ba7...
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Thu Aug 23 18:21:37 2007 -0700
+
+ Merge branch 'pci-rework'
+
+commit 4a87cab2765df548a3b5d796e19568a2576306b8
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:53 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit ffc5ba7f0b1cdefdcecf6bd47018b6a4924bfc44
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Wed Aug 22 12:38:14 2007 -0700
+
+ Merge PCI-rework support and "classic" PCI interface support into one tree
+
+ First pass at merging both trees. So far, this has only been compile
+ tested. I need to dig out a savage card to put in a system for
+ testing, so it may take another hour or two.
+
+commit 68ceead721aeb75b9faed6297407a320a83499e4
+Merge: da23218... bf5e2a5...
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Wed Aug 22 11:45:43 2007 -0700
+
+ Merge branch 'master' into pci-rework
+
+ Conflicts:
+
+ src/savage_driver.h
+
+commit da23218b067d9b1808fc1168737c79b3349af09e
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Wed Aug 22 11:42:47 2007 -0700
+
+ dos2unix
+
commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 17 03:25:48 2007 +0200
@@ -100,6 +179,17 @@ Date: Wed Jan 3 21:50:22 2007 -0500
SavageCloseScreen() unmaps memory, but SavageScreenInit()
never maps it again.
+commit 36c444e80324c82f7d02d9d95372123c923336a0
+Merge: f2191d4... e361a95...
+Author: Ian Romanick <idr@us.ibm.com>
+Date: Mon Dec 11 13:16:53 2006 -0800
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-savage into pci-rework
+
+ Conflicts:
+
+ src/savage_driver.c
+
commit 37240b81daa4ed46c27e439d22b6fd9909dac249
Author: Alex Deucher <alex@t41p.(none)>
Date: Wed Nov 22 11:56:41 2006 -0500
@@ -138,6 +228,12 @@ Date: Sun Sep 17 17:30:08 2006 -0400
re-order SavageMapMem() so that ram detection works again.
+commit f2191d412832312b494f313841d094f87f64a5ff
+Author: Ian Romanick <idr@umwelt.(none)>
+Date: Tue Aug 8 16:49:51 2006 -0700
+
+ Minimal change set to convert driver to the new PCI interfaces. Enjoy.
+
commit 5108d1dd581a6e649f89812affba8481491e1bd7
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 12:21:11 2006 -0700
diff --git a/Makefile.in b/Makefile.in
index 340f363..d972541 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -155,6 +155,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
diff --git a/config.guess b/config.guess
index 0f0fe71..278f9e9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/config.sub b/config.sub
index 5defff6..1761d8b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff --git a/configure b/configure
index 3b5740d..763ffe9 100755
--- a/configure
+++ b/configure
@@ -881,6 +881,10 @@ DRI_TRUE
DRI_FALSE
DRI_CFLAGS
DRI_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS
+XSERVER_LIBPCIACCESS_TRUE
+XSERVER_LIBPCIACCESS_FALSE
moduledir
DRIVER_NAME
APP_MAN_SUFFIX
@@ -917,7 +921,9 @@ PKG_CONFIG
XORG_CFLAGS
XORG_LIBS
DRI_CFLAGS
-DRI_LIBS'
+DRI_LIBS
+PCIACCESS_CFLAGS
+PCIACCESS_LIBS'
# Initialize some variables set by options.
@@ -1540,6 +1546,10 @@ Some influential environment variables:
XORG_LIBS linker flags for XORG, overriding pkg-config
DRI_CFLAGS C compiler flags for DRI, overriding pkg-config
DRI_LIBS linker flags for DRI, overriding pkg-config
+ PCIACCESS_CFLAGS
+ C compiler flags for PCIACCESS, overriding pkg-config
+ PCIACCESS_LIBS
+ linker flags for PCIACCESS, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -4383,7 +4393,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4386 "configure"' > conftest.$ac_ext
+ echo '#line 4396 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7125,11 +7135,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7128: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7138: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7132: \$? = $ac_status" >&5
+ echo "$as_me:7142: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7415,11 +7425,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7428: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7422: \$? = $ac_status" >&5
+ echo "$as_me:7432: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7519,11 +7529,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7532: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7526: \$? = $ac_status" >&5
+ echo "$as_me:7536: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9881,7 +9891,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9884 "configure"
+#line 9894 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9981,7 +9991,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9984 "configure"
+#line 9994 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12401,11 +12411,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12404: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12414: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12408: \$? = $ac_status" >&5
+ echo "$as_me:12418: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12505,11 +12515,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12508: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12512: \$? = $ac_status" >&5
+ echo "$as_me:12522: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14082,11 +14092,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14085: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14095: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14089: \$? = $ac_status" >&5
+ echo "$as_me:14099: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14186,11 +14196,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14189: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14193: \$? = $ac_status" >&5
+ echo "$as_me:14203: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16386,11 +16396,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16393: \$? = $ac_status" >&5
+ echo "$as_me:16403: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16676,11 +16686,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16679: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16689: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16683: \$? = $ac_status" >&5
+ echo "$as_me:16693: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16780,11 +16790,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16783: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16793: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16787: \$? = $ac_status" >&5
+ echo "$as_me:16797: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21120,6 +21130,191 @@ _ACEOF
fi
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+{ echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
+echo $ECHO_N "checking whether XSERVER_LIBPCIACCESS is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include "xorg-server.h"
+
+int
+main ()
+{
+#ifndef XSERVER_LIBPCIACCESS
+ (void) XSERVER_LIBPCIACCESS;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_XSERVER_LIBPCIACCESS=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
+echo "${ECHO_T}$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6; }
+if test $ac_cv_have_decl_XSERVER_LIBPCIACCESS = yes; then
+ XSERVER_LIBPCIACCESS=yes
+else
+ XSERVER_LIBPCIACCESS=no
+fi
+
+CFLAGS="$save_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for PCIACCESS" >&5
+echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_CFLAGS"; then
+ pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.10.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PCIACCESS_LIBS"; then
+ pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.10.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.10.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.10.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ else
+ PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.10.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PCIACCESS_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.10.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (pciaccess >= 0.10.0) were not met:
+
+$PCIACCESS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
+and PCIACCESS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
+ PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+fi
+ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ XSERVER_LIBPCIACCESS_TRUE=
+ XSERVER_LIBPCIACCESS_FALSE='#'
+else
+ XSERVER_LIBPCIACCESS_TRUE='#'
+ XSERVER_LIBPCIACCESS_FALSE=
+fi
+
+
@@ -21378,6 +21573,13 @@ echo "$as_me: error: conditional \"DRI\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z "${XSERVER_LIBPCIACCESS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -22065,6 +22267,10 @@ DRI_TRUE!$DRI_TRUE$ac_delim
DRI_FALSE!$DRI_FALSE$ac_delim
DRI_CFLAGS!$DRI_CFLAGS$ac_delim
DRI_LIBS!$DRI_LIBS$ac_delim
+PCIACCESS_CFLAGS!$PCIACCESS_CFLAGS$ac_delim
+PCIACCESS_LIBS!$PCIACCESS_LIBS$ac_delim
+XSERVER_LIBPCIACCESS_TRUE!$XSERVER_LIBPCIACCESS_TRUE$ac_delim
+XSERVER_LIBPCIACCESS_FALSE!$XSERVER_LIBPCIACCESS_FALSE$ac_delim
moduledir!$moduledir$ac_delim
DRIVER_NAME!$DRIVER_NAME$ac_delim
APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
@@ -22083,7 +22289,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/debian/changelog b/debian/changelog
index 7a65fc4..3e91567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xserver-xorg-video-savage (1:2.1.3-4) UNRELEASED; urgency=low
+ * Pull upstream up to 9c959f53ca8376aa136a9d434c3383cdb20487c2
+ + Fix crash in SavageSwitchMode(), closes: #440839.
* Add upstream URL to debian/copyright.
- -- Brice Goglin <bgoglin@debian.org> Sat, 15 Sep 2007 02:15:05 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 15:17:43 +0100
xserver-xorg-video-savage (1:2.1.3-3) unstable; urgency=low
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/Makefile.in b/man/Makefile.in
index 50142d8..ef9078c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -145,6 +145,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = sed
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.in b/src/Makefile.in
index 1988bdb..30dfed9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -179,6 +179,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
commit 9c959f53ca8376aa136a9d434c3383cdb20487c2
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Sep 14 20:21:12 2007 -0400
fix the build for the non-pci-rework case (compile tested only)
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 586fbad..9d4209a 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -40,6 +40,7 @@
#endif
#include <unistd.h>
+#include <errno.h>
#include "xf86RAC.h"
#include "shadowfb.h"
@@ -3080,9 +3081,9 @@ static Bool SavageMapMem(ScrnInfoPtr pScrn)
+ psav->PciInfo->regions[0].base_addr;
psav->FbRegion.base = psav->PciInfo->regions[1].base_addr;
#else
- psav->MmioBase = SAVAGE_NEWMMIO_REGBASE_S4
+ psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S4
+ psav->PciInfo->memBase[0];
- psav->FrameBufferBase = psav->PciInfo->memBase[1];
+ psav->FbRegion.base = psav->PciInfo->memBase[1];
#endif
}
diff --git a/src/savage_driver.h b/src/savage_driver.h
index a65b2d8..e032ddc 100644
--- a/src/savage_driver.h
+++ b/src/savage_driver.h
@@ -280,8 +280,13 @@ typedef struct _StatInfo {
} StatInfoRec,*StatInfoPtr;
struct savage_region {
+#ifdef XSERVER_LIBPCIACCESS
pciaddr_t base;
pciaddr_t size;
+#else
+ unsigned long base;
+ unsigned long size;
+#endif
void * memory;
};
commit 846a69f70d189c486448df269a512b8d42fab0c2
Author: Alex Deucher <alex@botch2.(none)>
Date: Fri Sep 14 20:13:33 2007 -0400
fix segfault from pScrn->currentMode
should fix bug 12260
diff --git a/src/savage_driver.c b/src/savage_driver.c
index a49f6a9..586fbad 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -119,7 +119,7 @@ static Bool SavageDDC1(int scrnIndex);
static unsigned int SavageDDC1Read(ScrnInfoPtr pScrn);
static void SavageProbeDDC(ScrnInfoPtr pScrn, int index);
static void SavageGetTvMaxSize(SavagePtr psav);
-static Bool SavagePanningCheck(ScrnInfoPtr pScrn);
+static Bool SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode);
#ifdef XF86DRI
static Bool SavageCheckAvailableRamFor3D(ScrnInfoPtr pScrn);
#endif
@@ -3627,7 +3627,7 @@ static Bool SavageScreenInit(int scrnIndex, ScreenPtr pScreen,
}
#endif
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, pScrn->currentMode);
#ifdef XvExtension
if( !psav->FBStart2nd && !psav->NoAccel /*&& !SavagePanningCheck(pScrn)*/ ) {
if (psav->IsSecondary)
@@ -4271,7 +4271,7 @@ Bool SavageSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
pSavEnt = pPriv->ptr;
SavageModeInit(pSavEnt->pSecondaryScrn, pSavEnt->pSecondaryScrn->currentMode);
}
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, mode);
return success;
}
@@ -4750,12 +4750,9 @@ SavageGetTvMaxSize(SavagePtr psav)
static Bool
-SavagePanningCheck(ScrnInfoPtr pScrn)
+SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode)
{
SavagePtr psav = SAVPTR(pScrn);
- DisplayModePtr pMode;
-
- pMode = pScrn->currentMode;
psav->iResX = pMode->CrtcHDisplay;
psav->iResY = pMode->CrtcVDisplay;
commit 7da1a03d4b8b40483001b1f6e56dae655a1797f4
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:43 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 0287432c65231460fadff7d8d7b332208e345a31
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 31 13:07:17 2007 -0700
Fix odd typo.
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 0346faa..a49f6a9 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -3226,7 +3226,7 @@ static void SavageUnmapMem(ScrnInfoPtr pScrn, int All)
#else
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)psav->FbRegion.base,
psav->FbRegion.size);
-#else
+#endif
}
if (psav->ApertureRegion.memory != NULL) {
commit 514dc647d108e179965adb1377b1d4c011afa367
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 30 17:53:11 2007 -0700
Update to use new libpciaccess interfaces for mapping with MTRR support.
diff --git a/configure.ac b/configure.ac
index 04a4c3e..d596b7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,11 +51,6 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
-AC_ARG_ENABLE(pciaccess,
- AS_HELP_STRING([--enable-pciaccess],
- [Enable use of libpciaccess (default: disabled)]),
- [PCIACCESS=$enableval],
- [PCIACCESS=no])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -100,12 +95,17 @@ if test "$DRI" = yes; then
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
-AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
-if test "x$PCIACCESS" = xyes; then
- AC_DEFINE(PCIACCESS, 1, [Use libpciaccess])
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.7.0])
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CFLAGS="$save_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
diff --git a/src/savage_dga.c b/src/savage_dga.c
index 49c9a3c..fd26d78 100644
--- a/src/savage_dga.c
+++ b/src/savage_dga.c
@@ -391,7 +391,7 @@ Savage_OpenFramebuffer(
SavagePtr psav = SAVPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)psav->FrameBufferBase;
+ *mem = (unsigned char*)psav->FbRegion.base;
*size = psav->videoRambytes;
*offset = 0;
*flags = DGA_NEED_ROOT;
diff --git a/src/savage_dri.c b/src/savage_dri.c
index aca0b8c..211fef0 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -624,7 +624,7 @@ static Bool SAVAGEDRIMapInit( ScreenPtr pScreen )
pSAVAGEDRIServer->registers.size = SAVAGEIOMAPSIZE;
if ( drmAddMap( psav->drmFD,
- (drm_handle_t)psav->MmioBase,
+ (drm_handle_t)psav->MmioRegion.base,
pSAVAGEDRIServer->registers.size,
DRM_REGISTERS,0,
&pSAVAGEDRIServer->registers.handle ) < 0 ) {
@@ -636,7 +636,7 @@ static Bool SAVAGEDRIMapInit( ScreenPtr pScreen )
pSAVAGEDRIServer->aperture.size = 5 * 0x01000000;
if ( drmAddMap( psav->drmFD,
- (drm_handle_t)(psav->ApertureBase),
+ (drm_handle_t)(psav->ApertureRegion.base),
pSAVAGEDRIServer->aperture.size,
DRM_FRAME_BUFFER,0,
&pSAVAGEDRIServer->aperture.handle ) < 0 ) {
Reply to: