COPYING | 72 +++++++++++++- ChangeLog | 61 ++++++++++++ README | 4 README.sgml | 3 configure.ac | 2 debian/README.source | 73 ++++++++++++++ debian/changelog | 9 + debian/control | 2 debian/xsfbs/xsfbs.mk | 21 ---- debian/xsfbs/xsfbs.sh | 245 -------------------------------------------------- man/i740.man | 54 ++++++++++- src/i740_driver.c | 71 +------------- src/i740_video.c | 1 13 files changed, 270 insertions(+), 348 deletions(-)
New commits: commit 60c2a199f3e0248c3bd819f4e40195ddca800b01 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 16:36:14 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 269a3aa..49e1989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xserver-xorg-video-i740 (1:1.3.2-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 16:29:27 +0200 diff --git a/debian/control b/debian/control index c504b6d..f113049 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.7.3 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i740 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i740.git commit 877bb098d2f5139064797955541ae047966cdb17 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 16:30:37 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index fd4e9f8..dc5d0ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +commit 947fbfd72fc81b26b0e167c4a8962e0a685b3381 +Author: Dave Airlie <[email protected]> +Date: Thu Jul 30 12:04:28 2009 +1000 + + i740: bump for release 1.3.2 + +commit 3190d52077bb22bb8a8f761aabd29afa9ea14534 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 15:22:40 2009 +1000 + + i740: change to using ABI version check + +commit c3c32b5be1c72ec8b9e0b07ada1be888a35cb50e +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 11:17:33 2009 +1000 + + i740: fix rac/resources properly + +commit 8f8428c28d1747b5b127307e710076022a4f7e0b +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 11:14:57 2009 +1000 + + Revert "i740: fixup for rac/resources" + + This reverts commit 32338c01531f26e599b69318157d86f9c1ea7d11. + +commit 32338c01531f26e599b69318157d86f9c1ea7d11 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 11:08:35 2009 +1000 + + i740: fixup for rac/resources + +commit 6a2c6b45e88403d5e0d7a2ca2e4c24693809484f +Author: Adam Jackson <[email protected]> +Date: Thu Jul 2 11:21:35 2009 -0400 + + i740 1.3.1 + +commit 88520119eb43d8fed27de88003171178e8305fbf +Author: Adam Jackson <[email protected]> +Date: Thu May 28 15:00:44 2009 -0400 + + Remove useless loader symbol lists. + +commit 17c0afa07e8adf05fe5ea51f3a69d86d3e6c5380 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 11 21:15:29 2009 -0700 + + Documentation update + + Copy list of driver options from README to man page + Remove xorgconfig from README/README.sgml + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3ee25988bbf773fc320e5215942b6341be2503a6 +Author: Alan Coopersmith <[email protected]> +Date: Mon May 11 20:53:46 2009 -0700 + + Fill in COPYING file + commit 85dbf1b7a259b8b8b3f378326ca7efa82752d1c0 Author: Adam Jackson <[email protected]> Date: Thu Mar 19 15:26:34 2009 -0400 diff --git a/debian/changelog b/debian/changelog index efe4d58..269a3aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xserver-xorg-video-i740 (1:1.3.0-2) UNRELEASED; urgency=low +xserver-xorg-video-i740 (1:1.3.2-1) UNRELEASED; urgency=low + [ David Nusinow ] * Remove 01_gen_pci_ids.diff. The server now uses an internal table to choose a driver during autoconfiguration. + Disable the patch system and remove quilt from the build-deps - -- David Nusinow <[email protected]> Mon, 04 May 2009 22:04:28 -0400 + [ Timo Aaltonen ] + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 16:29:27 +0200 xserver-xorg-video-i740 (1:1.3.0-1) unstable; urgency=low commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 947fbfd72fc81b26b0e167c4a8962e0a685b3381 Author: Dave Airlie <[email protected]> Date: Thu Jul 30 12:04:28 2009 +1000 i740: bump for release 1.3.2 diff --git a/configure.ac b/configure.ac index 8594e6b..21ca07e 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i740], - 1.3.1, + 1.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i740) commit 3190d52077bb22bb8a8f761aabd29afa9ea14534 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 i740: change to using ABI version check diff --git a/src/i740_driver.c b/src/i740_driver.c index f76f0be..6e6b0fa 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,7 +52,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif commit c3c32b5be1c72ec8b9e0b07ada1be888a35cb50e Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:17:33 2009 +1000 i740: fix rac/resources properly diff --git a/src/i740_driver.c b/src/i740_driver.c index b563c00..f76f0be 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,8 +52,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -432,7 +434,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { #ifndef XSERVER_LIBPCIACCESS pI740->PciTag = pciTag(pI740->PciInfo->bus, pI740->PciInfo->device, pI740->PciInfo->func); -#endif if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) return FALSE; @@ -440,7 +441,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; else pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -740,6 +741,7 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { +#ifndef XSERVER_LIBPCIACCESS resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, {ResShrIoBlock,0x3C0,0x3DF}, _END }; @@ -747,11 +749,13 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { {ResShrMemBlock,0xB8000,0xBFFFF}, {ResShrMemBlock,0xB0000,0xB7FFF}, _END }; - +#endif pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); +#endif } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index ad6c5f9..8cfe09a 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,7 +58,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 8f8428c28d1747b5b127307e710076022a4f7e0b Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:14:57 2009 +1000 Revert "i740: fixup for rac/resources" This reverts commit 32338c01531f26e599b69318157d86f9c1ea7d11. diff --git a/src/i740_driver.c b/src/i740_driver.c index 1f855aa..b563c00 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,6 +52,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" +#include "xf86RAC.h" #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -432,9 +434,17 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pI740->PciInfo->func); #endif + if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) + return FALSE; + if (pI740->usePIO) + pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; + else + pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; + /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; + flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { return FALSE; @@ -730,8 +740,18 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { + resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, + {ResShrIoBlock,0x3C0,0x3DF}, + _END }; + resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF}, + {ResShrMemBlock,0xB8000,0xBFFFF}, + {ResShrMemBlock,0xB0000,0xB7FFF}, + _END }; + pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); + xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); + xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index 8cfe09a..ad6c5f9 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,6 +58,7 @@ #include "xf86.h" #include "xf86_OSproc.h" +#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 32338c01531f26e599b69318157d86f9c1ea7d11 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 11:08:35 2009 +1000 i740: fixup for rac/resources diff --git a/src/i740_driver.c b/src/i740_driver.c index b563c00..1f855aa 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -52,8 +52,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" -#include "xf86RAC.h" #include "xf86cmap.h" /* If the driver uses port I/O directly, it needs: */ @@ -434,17 +432,9 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { pI740->PciInfo->func); #endif - if (xf86RegisterResources(pI740->pEnt->index, 0, ResNone)) - return FALSE; - if (pI740->usePIO) - pScrn->racIoFlags = RAC_FB | RAC_COLORMAP; - else - pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; - flags24=Support24bppFb | Support32bppFb | SupportConvert32to24; if (!xf86SetDepthBpp(pScrn, 0, 0, 0, flags24)) { return FALSE; @@ -740,18 +730,8 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* We wont be using the VGA access after the probe */ if (!xf86ReturnOptValBool(pI740->Options, OPTION_USE_PIO, FALSE)) { - resRange vgaio[] = { {ResShrIoBlock,0x3B0,0x3BB}, - {ResShrIoBlock,0x3C0,0x3DF}, - _END }; - resRange vgamem[] = {{ResShrMemBlock,0xA0000,0xAFFFF}, - {ResShrMemBlock,0xB8000,0xBFFFF}, - {ResShrMemBlock,0xB0000,0xB7FFF}, - _END }; - pI740->usePIO=FALSE; I740SetMMIOAccess(pI740); - xf86SetOperatingState(vgaio, pI740->pEnt->index, ResUnusedOpr); - xf86SetOperatingState(vgamem, pI740->pEnt->index, ResDisableOpr); } else { pI740->usePIO=TRUE; } diff --git a/src/i740_video.c b/src/i740_video.c index ad6c5f9..8cfe09a 100644 --- a/src/i740_video.c +++ b/src/i740_video.c @@ -58,7 +58,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" commit 6a2c6b45e88403d5e0d7a2ca2e4c24693809484f Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:21:35 2009 -0400 i740 1.3.1 diff --git a/configure.ac b/configure.ac index ec48aa8..8594e6b 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-i740], - 1.3.0, + 1.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-i740) commit 8f72294ada477f003888b6776883c1dd98289f3f Author: Julien Cristau <[email protected]> Date: Wed Jun 3 03:37:37 2009 +0200 Kill custom readlink function This was needed for very, very old versions of debianutils. Closes: #498890 diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 197eb74..781826f 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,16 +303,6 @@ EOF fi } -# we require a readlink command or shell function -if ! which readlink > /dev/null 2>&1; then - message "The readlink command was not found. Please install version" \ - "1.13.1 or later of the debianutils package." - readlink () { - # returns what symlink in $1 actually points to - perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1" - } -fi - check_symlink () { # syntax: check_symlink symlink # commit 88520119eb43d8fed27de88003171178e8305fbf Author: Adam Jackson <[email protected]> Date: Thu May 28 15:00:44 2009 -0400 Remove useless loader symbol lists. diff --git a/src/i740_driver.c b/src/i740_driver.c index f6a0688..b563c00 100644 --- a/src/i740_driver.c +++ b/src/i740_driver.c @@ -187,54 +187,6 @@ static const OptionInfoRec I740Options[] = { { -1, NULL, OPTV_NONE, {0}, FALSE} }; -static const char *vgahwSymbols[] = { - "vgaHWGetHWRec", - "vgaHWSave", /* Added */ - "vgaHWRestore", /* Added */ - "vgaHWProtect", - "vgaHWInit", - "vgaHWMapMem", - "vgaHWSetMmioFuncs", - "vgaHWGetIOBase", - "vgaHWLock", - "vgaHWUnlock", - "vgaHWFreeHWRec", - "vgaHWSaveScreen", - "vgaHWHandleColormaps", - 0 -}; - -#ifdef XFree86LOADER -static const char *fbSymbols[] = { - "fbScreenInit", - "fbPictureInit", - NULL -}; -#endif - -static const char *xaaSymbols[] = { - "XAADestroyInfoRec", - "XAACreateInfoRec", - "XAAInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86InitCursor", - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; -#endif - #ifdef XFree86LOADER static MODULESETUPPROTO(i740Setup); @@ -272,14 +224,6 @@ i740Setup(pointer module, pointer opts, int *errmaj, int *errmin) */ /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols, - ramdacSymbols, vbeSymbols, - NULL); - - /* * The return value must be non-NULL on success even though there * is no TearDownProc. */ @@ -481,8 +425,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { /* The vgahw module should be loaded here when needed */ if (!xf86LoadSubModule(pScrn, "vgahw")) return FALSE; - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* Allocate a vgaHWRec */ if (!vgaHWGetHWRec(pScrn)) return FALSE; @@ -781,14 +723,12 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymbols("fbScreenInit","fbPictureInit", NULL); if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) { if (!xf86LoadSubModule(pScrn, "xaa")) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } if (!xf86ReturnOptValBool(pI740->Options, OPTION_SW_CURSOR, FALSE)) { @@ -796,7 +736,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) { I740FreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* We wont be using the VGA access after the probe */ commit 7deebf983f53c505bc25171ab77fdc408f250a6e Author: Julien Cristau <[email protected]> Date: Tue May 26 15:58:19 2009 +0200 xsfbs: don't run dpkg --print-installation-architecture -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
