xserver-xorg-video-chips: Changes to 'debian-experimental'
ChangeLog | 43 ++++
configure.ac | 2
debian/README.source | 73 +++++++
debian/changelog | 31 +++
debian/control | 4
debian/patches/03_gen_pci_ids.diff | 20 --
debian/patches/series | 1
debian/xserver-xorg-video-chips.install | 1
debian/xsfbs/repack.sh | 32 +++
debian/xsfbs/xsfbs.mk | 21 --
debian/xsfbs/xsfbs.sh | 311 --------------------------------
man/chips.man | 2
src/ct_driver.c | 188 +++++--------------
src/ct_shadow.c | 1
src/ct_video.c | 1
15 files changed, 241 insertions(+), 490 deletions(-)
New commits:
commit 1c3a40d04d4c06be074cc28b5dc936c91444d149
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 6 03:29:49 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 04af49d..f3a9cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-chips (1:1.2.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.2.2-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:06 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 06 Dec 2009 03:29:43 +0100
xserver-xorg-video-chips (1:1.2.1-3) unstable; urgency=low
commit a8e8f348edc826e01136b37d194861a5a905fed2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:25 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 092f98e..04af49d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-chips (1:1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:07:03 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:06 +0200
xserver-xorg-video-chips (1:1.2.1-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0774e69..3c30bd0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-core-dev,
x11proto-fonts-dev,
commit b23f24da4da2468f2b1608c2c74133c2dc628e75
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:09:15 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index df77657..092f98e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-chips (1:1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:07:03 +0200
diff --git a/debian/control b/debian/control
index f084535..0774e69 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-chips.git
commit 20d9f7e8f48005afc849ef4ddaddec6bbff51802
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 16:07:31 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1633dd1..28f9b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+commit 49be03ad0812bcc14df8d80e767f8b88330e3fee
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Aug 19 13:43:47 2009 -0400
+
+ chips 1.2.2
+
+commit 7a839c301d862a506b2368c98f2174a58b4d29a1
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ chips: change to using ABI version check
+
+commit b6a8f36c406ec1c4a72f19bd8a6caf14058390aa
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:29 2009 +1000
+
+ chips: update for resources/RAC API removal
+
commit 722267e99012d0b8bbd7f22eaeac99e85bf48e0c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 19 10:37:37 2009 +0200
diff --git a/debian/changelog b/debian/changelog
index 07ecba8..df77657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-chips (1:1.2.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 16:07:03 +0200
+
xserver-xorg-video-chips (1:1.2.1-3) unstable; urgency=low
[ David Nusinow ]
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit 49be03ad0812bcc14df8d80e767f8b88330e3fee
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 19 13:43:47 2009 -0400
chips 1.2.2
diff --git a/configure.ac b/configure.ac
index b4120a3..3faac1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-chips],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-chips)
commit 7a839c301d862a506b2368c98f2174a58b4d29a1
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
chips: change to using ABI version check
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 828394f..eda2f63 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -85,7 +85,7 @@
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
/* Standard resources are defined here */
#include "xf86Resources.h"
commit b6a8f36c406ec1c4a72f19bd8a6caf14058390aa
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:29 2009 +1000
chips: update for resources/RAC API removal
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 998c590..828394f 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -85,9 +85,14 @@
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
+#ifndef XSERVER_LIBPCIACCESS
/* Standard resources are defined here */
#include "xf86Resources.h"
+/* Needed by Resources Access Control (RAC) */
+#include "xf86RAC.h"
+#endif
+
/* All drivers using the vgahw module need this */
#include "vgaHW.h"
@@ -115,9 +120,6 @@
#include "xf4bpp.h"
#endif
-/* Needed by Resources Access Control (RAC) */
-#include "xf86RAC.h"
-
/* int10 */
#include "xf86int10.h"
#include "vbe.h"
@@ -1104,7 +1106,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
/* This is the general case */
for (i = 0; i<pScrn->numEntities; i++) {
cPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->pEnt->resources) return FALSE;
+#endif
/* If we are using libpciaccess this is already set in CHIPSPciProbe.
* If we are using something else we need to set it here.
*/
@@ -1371,11 +1375,14 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
}
}
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->Flags & ChipsLinearSupport)
xf86SetOperatingState(resVgaMem, cPtr->pEnt->index, ResDisableOpr);
if (cPtr->MMIOBaseVGA)
xf86SetOperatingState(resVgaIo, cPtr->pEnt->index, ResDisableOpr);
+#endif
+
vbeFree(cPtr->pVbe);
cPtr->pVbe = NULL;
return TRUE;
@@ -1400,7 +1407,9 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
CHIPSPanelSizePtr Size = &cPtr->PanelSize;
CHIPSMemClockPtr MemClk = &cPtr->MemClock;
CHIPSClockPtr SaveClk = &(cPtr->SavedReg.Clock);
+#ifndef XSERVER_LIBPCIACCESS
resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -1549,8 +1558,10 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
cPtr->FbAddress = PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
from = X_PROBED;
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
cPtr->Flags &= ~ChipsLinearSupport;
+#endif
} else {
if (cPtr->pEnt->device->MemBase) {
cPtr->FbAddress = cPtr->pEnt->device->MemBase;
@@ -1562,12 +1573,14 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
(0x80 & (cPtr->readXR(cPtr, 0x05)))) << 16;
from = X_PROBED;
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].rBegin = cPtr->FbAddress;
linearRes[0].rEnd = cPtr->FbAddress + 0x800000;
if (xf86RegisterResources(cPtr->pEnt->index,linearRes,ResNone)) {
cPtr->Flags &= ~ChipsLinearSupport;
from = X_PROBED;
}
+#endif
}
}
if (cPtr->Flags & ChipsLinearSupport) {
@@ -2455,7 +2468,9 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
CHIPSClockPtr SaveClk = &(cPtr->SavedReg.Clock);
Bool useLinear = FALSE;
char *s;
+#ifndef XSERVER_LIBPCIACCESS
resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -2651,12 +2666,14 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
cPtr->FbAddress |= ((mask & (cPtr->readXR(cPtr, 0x08))) << 16);
from = X_PROBED;
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].rBegin = cPtr->FbAddress;
linearRes[0].rEnd = cPtr->FbAddress + 0x800000;
if (xf86RegisterResources(cPtr->pEnt->index,linearRes,ResNone)) {
useLinear = FALSE;
from = X_PROBED;
}
+#endif
}
if (useLinear) {
@@ -2767,6 +2784,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
ErrorF("DR[%X] = %X\n",i,cPtr->Regs32[i]);
#endif
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].type = ResExcIoSparse | ResBios | ResBus;
linearRes[0].rBase = cPtr->Regs32[0];
linearRes[0].rMask = 0x83FC;
@@ -2784,6 +2802,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags)
"Disabling HWCursor\n");
}
}
+#endif
}
cPtr->ClockMulFactor = ((pScrn->bitsPerPixel >= 8) ? bytesPerPixel : 1);
@@ -2915,7 +2934,9 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
CHIPSClockPtr SaveClk = &(cPtr->SavedReg.Clock);
Bool useLinear = FALSE;
char *s;
+#ifndef XSERVER_LIBPCIACCESS
resRange linearRes[] = { {ResExcMemBlock|ResBios|ResBus,0,0},_END };
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -3111,9 +3132,12 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
}
if (cPtr->pEnt->location.type == BUS_PCI) {
cPtr->FbAddress = PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
- if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
- useLinear = FALSE;
+#ifndef XSERVER_LIBPCIACCESS
+ if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone)) {
+ useLinear = FALSE;
from = X_PROBED;
+ }
+#endif
} else {
if (cPtr->pEnt->device->MemBase) {
cPtr->FbAddress = cPtr->pEnt->device->MemBase;
@@ -3137,12 +3161,14 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
}
from = X_PROBED;
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].rBegin = cPtr->FbAddress;
linearRes[0].rEnd = cPtr->FbAddress + 0x800000;
if (xf86RegisterResources(cPtr->pEnt->index,linearRes,ResNone)) {
useLinear = FALSE;
from = X_PROBED;
}
+#endif
}
}
@@ -3442,6 +3468,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
ErrorF("DR[%X] = %X\n",i,cPtr->Regs32[i]);
#endif
}
+#ifndef XSERVER_LIBPCIACCESS
linearRes[0].type = ResExcIoSparse | ResBios | ResBus;
linearRes[0].rBase = cPtr->Regs32[0];
linearRes[0].rMask = 0x83FC;
@@ -3459,6 +3486,7 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags)
"Disabling HWCursor\n");
}
}
+#endif
}
/* sync reset ignored on this chipset */
@@ -4375,12 +4403,14 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
racflag = RAC_COLORMAP;
if (cAcl->UseHWCursor)
racflag |= RAC_CURSOR;
racflag |= (RAC_FB | RAC_VIEWPORT);
/* XXX Check if I/O and Mem flags need to be the same. */
pScrn->racIoFlags = pScrn->racMemFlags = racflag;
+#endif
#ifdef ENABLE_SILKEN_MOUSE
xf86SetSilkenMouse(pScreen);
#endif
diff --git a/src/ct_shadow.c b/src/ct_shadow.c
index 0750c19..896eac3 100644
--- a/src/ct_shadow.c
+++ b/src/ct_shadow.c
@@ -5,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
diff --git a/src/ct_video.c b/src/ct_video.c
index a1e8044..130634b 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -5,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Resources.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit b8feefe714ee3eb790fa4350b92e5a802e17751f
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:31:10 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index ed60180..07ecba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-chips (1:1.2.1-3) unstable; urgency=low
[ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The server now uses an internal table to
@@ -9,7 +9,7 @@ xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
* Pull from upstream master up to commit 722267e9.
+ Fix PCI card probe and chipset detection, closes: #534397.
- -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:29:55 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:31:02 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
commit 157b476bfc144d96508435b2b9bd2b482442b6cc
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:30:55 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index f90e6c8..1633dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+commit 722267e99012d0b8bbd7f22eaeac99e85bf48e0c
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Jul 19 10:37:37 2009 +0200
+
+ Fix PCI card probe and chipset detection.
+
+ it appears that the chips&technologies X driver was partially broken
+ during libpciaccess conversion. Thanks to the analysis by Marien Swart
+ in bug #18122 and a similar fix by Mark Kettenis for the radeon
+ driver.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 6c6b0933da2fb08e0804647f736b0155909d6348
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 14:51:29 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit a8d0e8c0665be8d1004458c464a453cf251823ce
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 9 16:26:30 2009 -0800
+
+ Remove xorgconfig & xorgcfg from See Also list in man page
+
commit 6380f6ac5924397c0be27198e9779971eb9b0086
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 22 14:27:11 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index beb435f..ed60180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add README.source, bump Standards-Version to 3.8.2.
+ * Pull from upstream master up to commit 722267e9.
+ + Fix PCI card probe and chipset detection, closes: #534397.
- -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:27:30 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:29:55 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
commit f50aea27eb85e64663bc6e4964d738a8cbf23e7b
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:27:57 2009 +0200
Adding README.source means we can bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index a238b06..beb435f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Remove 03_gen_pci_ids.diff. The server now uses an internal table to
pick a video card during autoconfig.
- -- David Nusinow <dnusinow@debian.org> Mon, 04 May 2009 21:47:51 -0400
+ [ Brice Goglin ]
+ * Add README.source, bump Standards-Version to 3.8.2.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 21 Jul 2009 18:27:30 +0200
xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0b07d76..f084535 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-chips
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-chips.git
commit 5e694ec7dc4f506cf80b074eb40139842872bf55
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jul 21 18:27:08 2009 +0200
Don't try to install usr/share/xserver-xorg/pci/* anymore
diff --git a/debian/xserver-xorg-video-chips.install b/debian/xserver-xorg-video-chips.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-chips.install
+++ b/debian/xserver-xorg-video-chips.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*
Reply to: